Regatten.net/RegattenApp
1
0
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/extServiceWfn'

Browse Source
This commit is contained in:
ostertun
2023-04-28 21:44:27 +02:00
parent a37cf0ea46 dcc5428615
commit e5dc107a7d
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/scripts/regatten.js.php
View File

@@ -680,12 +680,21 @@ function ro_getLink(type, eventId, classId) {
} }
return ''; return '';
} }
function wfn_getLink(type, eventId, classId) {
switch (type) {
case 'entrylist':
return 'https://wettfahrten.net/event/' + eventId + '/entrylist?class=' + classId;
}
return '';
}
function extServiceGetLink(serviceName, type, eventId = '', classId = '') { function extServiceGetLink(serviceName, type, eventId = '', classId = '') {
switch (serviceName) { switch (serviceName) {
case 'm2s': case 'm2s':
return m2s_getLink(type, eventId, classId); return m2s_getLink(type, eventId, classId);
case 'ro': case 'ro':
return ro_getLink(type, eventId); return ro_getLink(type, eventId);
case 'wfn':
return wfn_getLink(type, eventId);
} }
return ''; return '';
} }

4
server/content/index.php
View File

@@ -74,8 +74,8 @@
$content .= '<font class="show-loggedin">Erstelle einfach eine <a href="' . LINK_PRE . 'planning">Saison-Planung</a> und abonniere Deinen persönlichen Kalender.</font>'; $content .= '<font class="show-loggedin">Erstelle einfach eine <a href="' . LINK_PRE . 'planning">Saison-Planung</a> und abonniere Deinen persönlichen Kalender.</font>';
$content .= '<font class="show-notloggedin"><a href="#" data-menu="menu-signup">Registriere Dich einfach kostenlos</a>, erstelle eine Saison-Planung und wir erstellen Dir einen pers&ouml;nlichen Kalender.</font>'; $content .= '<font class="show-notloggedin"><a href="#" data-menu="menu-signup">Registriere Dich einfach kostenlos</a>, erstelle eine Saison-Planung und wir erstellen Dir einen pers&ouml;nlichen Kalender.</font>';
$content .= '</p>'; $content .= '</p>';
$content .= $tpl->load('button', ['<i class="fas fa-calendar-alt"></i> Regatta-Kalender', 'https://regatten.net/client/calendar/' . BOATCLASS . '/everything.ics', 'css-class' => 'mb-2']); $content .= $tpl->load('button', ['<i class="fas fa-calendar-alt"></i> Regatta-Kalender', 'https://ranglisten.net/client/calendar/' . BOATCLASS . '/everything.ics', 'css-class' => 'mb-2']);
$content .= $tpl->load('button', ['<i class="fas fa-calendar-alt"></i> Kalender f&uuml;r <font class="replace-username"></font>', 'https://regatten.net/client/calendar/' . BOATCLASS . '/user_%USERID%.ics', 'css-class' => 'show-loggedin replace-userid-href']); $content .= $tpl->load('button', ['<i class="fas fa-calendar-alt"></i> Kalender f&uuml;r <font class="replace-username"></font>', 'https://ranglisten.net/client/calendar/' . BOATCLASS . '/user_%USERID%.ics', 'css-class' => 'show-loggedin replace-userid-href']);
$sp['output'] .= $tpl->load('card', [$content]); $sp['output'] .= $tpl->load('card', [$content]);

2
server/page/menus.php
View File

@@ -317,7 +317,7 @@
Das Nachladen kann au&szlig;erdem gerade bei gro&szlig;en Datenmengen (wie Ranglisten) sehr lange dauern. Das Nachladen kann au&szlig;erdem gerade bei gro&szlig;en Datenmengen (wie Ranglisten) sehr lange dauern.
Wir empfehlen Dir daher, auf diesem Ger&auml;t unsere normale Website zu benutzen. Diese ist auch f&uuml;r Mobil-Ger&auml;te optimiert. Wir empfehlen Dir daher, auf diesem Ger&auml;t unsere normale Website zu benutzen. Diese ist auch f&uuml;r Mobil-Ger&auml;te optimiert.
</p> </p>
<a class="btn btn-m mt-2 btn-full bg-highlight text-uppercase font-900" href="https://regatten.net/">Zur Website</a> <a class="btn btn-m mt-2 btn-full bg-highlight text-uppercase font-900" href="https://ranglisten.net/">Zur Website</a>
<a id="menu-nodb-warning-okay" class="btn btn-m mt-2 mb-3 btn-full bg-highlight text-uppercase font-900" href="#">Nicht erneut anzeigen</a> <a id="menu-nodb-warning-okay" class="btn btn-m mt-2 mb-3 btn-full bg-highlight text-uppercase font-900" href="#">Nicht erneut anzeigen</a>
</div> </div>
</div> </div>

2
server/scripts/rank.js
View File

@@ -166,7 +166,7 @@ function selectChange(callSiteScript = true) {
var btns = ''; var btns = '';
for (var i in specialRanks) { for (var i in specialRanks) {
var sr = specialRanks[i]; var sr = specialRanks[i];
var link = 'https://regatten.net/frame.php?class=' + BOATCLASS + '&site=special_rank&rank_id=' + sr.id; var link = 'https://ranglisten.net/frame.php?class=' + BOATCLASS + '&site=special_rank&rank_id=' + sr.id;
var name = sr.title; var name = sr.title;
var cssclass = i > 0 ? ' mt-3' : ''; var cssclass = i > 0 ? ' mt-3' : '';
btns += '<a class="btn btn-full rounded-s text-uppercase font-900 shadow-m bg-highlight' + cssclass + '" href="' + link + '">' + name + '</a>'; btns += '<a class="btn btn-full rounded-s text-uppercase font-900 shadow-m bg-highlight' + cssclass + '" href="' + link + '">' + name + '</a>';

2
server/version.php
View File

@@ -1,5 +1,5 @@
<?php <?php
define('PWA_VERSION', '1.12.1h2'); define('PWA_VERSION', '1.12.1h3');
?> ?>