generated from jric11/baseProject
ChatGPT's update to harden software and run db updates.
This commit is contained in:
+4
-2
@@ -10,9 +10,11 @@
|
||||
<xsl:param name="PAGE-NAME">addAlert</xsl:param>
|
||||
|
||||
<xsl:template match="/">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="css/suneditor-3.3.3.min.css"/>
|
||||
<script src="js/suneditor-3.3.3.min.js"/>
|
||||
<script src="js/rich-text.js?version={$VERSION}"/>
|
||||
<script src="js/{$PAGE-NAME}.js?version={$VERSION}"/>
|
||||
<script src="js/ckeditor.js?version={$VERSION}"/>
|
||||
|
||||
<div class="{$PAGE-NAME}">
|
||||
|
||||
|
||||
+4
-2
@@ -10,9 +10,11 @@
|
||||
<xsl:param name="PAGE-NAME">addPopover</xsl:param>
|
||||
|
||||
<xsl:template match="/">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="css/suneditor-3.3.3.min.css"/>
|
||||
<script src="js/suneditor-3.3.3.min.js"/>
|
||||
<script src="js/rich-text.js?version={$VERSION}"/>
|
||||
<script src="js/{$PAGE-NAME}.js?version={$VERSION}"/>
|
||||
<script src="js/ckeditor.js?version={$VERSION}"/>
|
||||
|
||||
<div class="{$PAGE-NAME}">
|
||||
|
||||
|
||||
+13
-2
@@ -1,6 +1,7 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
|
||||
<xsl:param name="CSRF_TOKEN"/>
|
||||
<xsl:param name="CAN_MANAGE_CLUBS"/><xsl:param name="IS_SUPER"/>
|
||||
<xsl:output method="html" encoding="utf-8" indent="yes"/>
|
||||
|
||||
<!-- Parameters -->
|
||||
@@ -66,6 +67,7 @@
|
||||
</a>
|
||||
<button type="button" class="btn-close btn-close-white d-lg-none position-absolute top-0 end-0 m-3" data-bs-dismiss="offcanvas" data-bs-target="#hr-sidebar" aria-label="Close navigation"/>
|
||||
<div class="offcanvas-body">
|
||||
<xsl:if test="$IS_SUPER = '1'"><a class="nav-link" href="main.php?Xaction=Roster.createClub"><i class="bi bi-plus-circle me-1" aria-hidden="true"/>Create club</a></xsl:if>
|
||||
<div class="hr-sidebar-caption">Club workspace</div>
|
||||
<ul class="navbar-nav">
|
||||
|
||||
@@ -74,9 +76,18 @@
|
||||
<i class="bi bi-people me-1" aria-hidden="true"/>Clubs</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="main.php?Xaction=Roster.invitations">
|
||||
<i class="bi bi-calendar4-event me-1"></i>Invitations</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="main.php?Xaction=Roster.tickets">
|
||||
<i class="bi bi-ticket-perforated me-1"></i>Tickets</a>
|
||||
</li>
|
||||
|
||||
<!-- MANAGE/REPORTS/SETUP is only available to Administrators -->
|
||||
|
||||
<xsl:if test="$USER_ROLE = 'Administrator' or $USER_ROLE = 'System Administrator'">
|
||||
<xsl:if test="$CAN_MANAGE_CLUBS = '1'">
|
||||
|
||||
<li class="nav-link disabled">
|
||||
<xsl:text> | </xsl:text>
|
||||
@@ -138,7 +149,7 @@
|
||||
<a class="dropdown-item ps-2 toggle-theme" href="#">
|
||||
<i class="bi bi-moon me-2"/>Toggle Dark/Light</a>
|
||||
|
||||
<xsl:if test="$USER_ROLE = 'Administrator' or $USER_ROLE = 'System Administrator'">
|
||||
<xsl:if test="$USER_ROLE = 'Super System Administrator'">
|
||||
|
||||
<div class="dropdown-divider mt-1 mb-1"/>
|
||||
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
<xsl:param name="USER_FIRST_NAME"></xsl:param>
|
||||
<xsl:param name="USER_LAST_NAME"></xsl:param>
|
||||
<xsl:param name="USER_EMAIL"></xsl:param>
|
||||
<xsl:param name="REGISTRATION_KIND">new_club</xsl:param>
|
||||
<xsl:param name="CLUB_NAME"/>
|
||||
<xsl:param name="USER_NAME"></xsl:param>
|
||||
<xsl:param name="CSRF_TOKEN"></xsl:param>
|
||||
<xsl:param name="VERSION"></xsl:param>
|
||||
@@ -85,7 +87,7 @@
|
||||
</div>
|
||||
</xsl:if>
|
||||
<xsl:if test="$SIGNUP_SUCCESSFUL = 'TRUE'">
|
||||
<div class="alert alert-success" role="alert">Your account has been created. You can now sign in. Verify your email before club membership can be activated. Check your email, or <a href="main.php?Xaction=verifyemail">request a verification link</a>. Your club administrator manages membership and access.</div>
|
||||
<div class="alert alert-success" role="alert">Your account has been created. <xsl:choose><xsl:when test="$REGISTRATION_KIND = 'invited'">Verify your email, then sign in and accept your club invitation.</xsl:when><xsl:otherwise>Your new club is registered. Verify your email, then sign in and set up an authenticator to start managing it.</xsl:otherwise></xsl:choose> Check your email, or <a href="main.php?Xaction=verifyemail">request a verification link</a>.</div>
|
||||
</xsl:if>
|
||||
<xsl:if test="$SIGNUP_SUCCESSFUL != 'TRUE'">
|
||||
<form action="{$BTN_SUBMIT}" name="{$FORM_NAME}" id="{$FORM_NAME}" method="post" data-create-account="true">
|
||||
@@ -95,7 +97,10 @@
|
||||
<xsl:if test="string-length($CSRF_TOKEN) > 0">
|
||||
<input type="hidden" name="csrf_token" value="{$CSRF_TOKEN}"/>
|
||||
</xsl:if>
|
||||
<input type="hidden" name="registration_kind" value="{$REGISTRATION_KIND}"/>
|
||||
<xsl:choose><xsl:when test="$REGISTRATION_KIND = 'invited'"><p>Use the email address your club administrator invited. After verifying your email, accept the invitation under Invitations.</p></xsl:when><xsl:otherwise><p>Register your hunting club and become its administrator. Verify your email and set up an authenticator before managing the club.</p></xsl:otherwise></xsl:choose>
|
||||
<div class="row g-3">
|
||||
<xsl:if test="$REGISTRATION_KIND != 'invited'"><div class="col-12"><label for="club_name" class="form-label">New club name</label><input type="text" id="club_name" name="club_name" class="form-control" maxlength="128" required="required" value="{$CLUB_NAME}"/><div class="form-text">This creates a separate club. Entering an existing club's name does not grant access to it.</div></div></xsl:if>
|
||||
<div class="col-sm-6">
|
||||
<label for="user_first_name" class="form-label">First name</label>
|
||||
<input type="text" id="user_first_name" name="user_first_name" class="form-control" autocomplete="given-name" required="required" value="{$USER_FIRST_NAME}"/>
|
||||
@@ -123,9 +128,10 @@
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary w-100 mt-4">Create account</button>
|
||||
<p class="small text-secondary mt-3 mb-0">Your club administrator manages club membership and access.</p>
|
||||
<p class="small text-secondary mt-3 mb-0">Club access requires a verified email. Administrators also use an authenticator.</p>
|
||||
</form>
|
||||
</xsl:if>
|
||||
<p class="login-help"><xsl:choose><xsl:when test="$REGISTRATION_KIND = 'invited'"><a href="main.php?Xaction=signup">Register a new club instead</a></xsl:when><xsl:otherwise>Invited to a club? <a href="main.php?Xaction=signup&membership=invited">Create your member account</a>.</xsl:otherwise></xsl:choose></p>
|
||||
<p class="login-help">Already have an account? <a href="{$BTN_SIGNIN}">Sign in</a></p>
|
||||
<div class="login-bottom">
|
||||
<div class="mb-2">Unauthorized Access is Prohibited</div>
|
||||
|
||||
+4
-2
@@ -10,9 +10,11 @@
|
||||
<xsl:param name="PAGE-NAME">editAlert</xsl:param>
|
||||
|
||||
<xsl:template match="/">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="css/suneditor-3.3.3.min.css"/>
|
||||
<script src="js/suneditor-3.3.3.min.js"/>
|
||||
<script src="js/rich-text.js?version={$VERSION}"/>
|
||||
<script src="js/{$PAGE-NAME}.js?version={$VERSION}"/>
|
||||
<script src="js/ckeditor.js?version={$VERSION}"/>
|
||||
|
||||
<div class="{$PAGE-NAME}">
|
||||
|
||||
|
||||
+4
-2
@@ -10,9 +10,11 @@
|
||||
<xsl:param name="PAGE-NAME">editPopover</xsl:param>
|
||||
|
||||
<xsl:template match="/">
|
||||
|
||||
|
||||
<link rel="stylesheet" href="css/suneditor-3.3.3.min.css"/>
|
||||
<script src="js/suneditor-3.3.3.min.js"/>
|
||||
<script src="js/rich-text.js?version={$VERSION}"/>
|
||||
<script src="js/{$PAGE-NAME}.js?version={$VERSION}"/>
|
||||
<script src="js/ckeditor.js?version={$VERSION}"/>
|
||||
|
||||
<div class="{$PAGE-NAME}">
|
||||
|
||||
|
||||
Reference in New Issue
Block a user