From gitlab at projects.sucs.org  Tue Sep 19 12:12:52 2023
From: gitlab at projects.sucs.org (Andrew Vincent Pover (@andy))
Date: Tue, 19 Sep 2023 12:12:52 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] Fix incorrect SU URL
Message-ID: <650982347dccf_5c249cdc7733c@gitlab.mail>



Andrew Vincent Pover pushed to branch master at sucssite / sucs-site


Commits:
35fe6ad3 by Andrew Vincent Pover at 2023-09-19T11:12:35+00:00
Fix incorrect SU URL
- - - - -


1 changed file:

- templates/susignup.tpl


Changes:

=====================================
templates/susignup.tpl
=====================================
@@ -1,53 +1,53 @@
-{if $mode=='login'}
-    <form action="{$componentpath}" method="post">
-        <div class="box" style="width: 70%; margin: auto;">
-            <div class="boxhead"><h2>Membership Signup</h2></div>
-            <div class="boxcontent">
-
-                <p>Please enter your Transation ID. It can be found by logging into <a
-                            href='http://www.swansea-union.co.uk/shop/purchasehistory/'>swansea-union.com</a> and
-                    selecting purchase history.</p>
-
-                <div class="row">
-                    <label for="sid">Student Number:</label>
-                    <span class="textinput"><input type="text" size="20" name="sid" id="sid"/></span>
-                </div>
-                <div class="row">
-                    <label for="transactionID">Transaction ID:</label>
-                    <span class="textinput"><input type="text" size="20" name="transactionID"
-                                                   id="transactionID"/></span>
-                </div>
-                <div class="row"><span class="textinput">
-                <input type="submit" name="submit" value="Join"/></span>
-                </div>
-                <div class="clear"></div>
-                <div class="note">If you already have an account and wish to renew, simply buy an additional years
-                    membership from the <a href='https://sucs.org/join'>SUSU website</a>. Enter
-                    the details above and click "Join"
-                </div>
-            </div>
-            <div class="hollowfoot">
-                <div>
-                    <div></div>
-                </div>
-            </div>
-        </div>
-    </form>
-{elseif $mode=='form'}
-    <h1>Signup</h1>
-    <p>To contiune signup now click below</p>
-    <form action="{$baseurl}/signup/" method="post">
-        <input type=hidden name="signupid" id="id" value="{$id}"/>
-        <input type=hidden name="signuppw" id="pass" value="{$pass}"/>
-        <input type=hidden name="signupsid" id="sid" value="{$sid}"/>
-        <input type=submit name="submit" value="Proceed"/>
-    </form>
-{else}
-    <h1>Error</h1>
-    <div class='errorbar'>
-        <strong>Error: </strong> {$error_text}
-    </div>
-    An error occured during signup, please email, with as much information as you can provide,
-    <a href='mailto:admin at sucs.org'>admin at sucs.org</a>
-    for assistance.
-{/if}
+{if $mode=='login'}
+    <form action="{$componentpath}" method="post">
+        <div class="box" style="width: 70%; margin: auto;">
+            <div class="boxhead"><h2>Membership Signup</h2></div>
+            <div class="boxcontent">
+
+                <p>Please enter your Transation ID. It can be found by logging into <a
+                            href='http://www.swansea-union.co.uk/shop/purchasehistory/'>swansea-union.co.uk</a> and
+                    selecting purchase history.</p>
+
+                <div class="row">
+                    <label for="sid">Student Number:</label>
+                    <span class="textinput"><input type="text" size="20" name="sid" id="sid"/></span>
+                </div>
+                <div class="row">
+                    <label for="transactionID">Transaction ID:</label>
+                    <span class="textinput"><input type="text" size="20" name="transactionID"
+                                                   id="transactionID"/></span>
+                </div>
+                <div class="row"><span class="textinput">
+                <input type="submit" name="submit" value="Join"/></span>
+                </div>
+                <div class="clear"></div>
+                <div class="note">If you already have an account and wish to renew, simply buy an additional years
+                    membership from the <a href='https://sucs.org/join'>SUSU website</a>. Enter
+                    the details above and click "Join"
+                </div>
+            </div>
+            <div class="hollowfoot">
+                <div>
+                    <div></div>
+                </div>
+            </div>
+        </div>
+    </form>
+{elseif $mode=='form'}
+    <h1>Signup</h1>
+    <p>To contiune signup now click below</p>
+    <form action="{$baseurl}/signup/" method="post">
+        <input type=hidden name="signupid" id="id" value="{$id}"/>
+        <input type=hidden name="signuppw" id="pass" value="{$pass}"/>
+        <input type=hidden name="signupsid" id="sid" value="{$sid}"/>
+        <input type=submit name="submit" value="Proceed"/>
+    </form>
+{else}
+    <h1>Error</h1>
+    <div class='errorbar'>
+        <strong>Error: </strong> {$error_text}
+    </div>
+    An error occured during signup, please email, with as much information as you can provide,
+    <a href='mailto:admin at sucs.org'>admin at sucs.org</a>
+    for assistance.
+{/if}



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/-/commit/35fe6ad35cab43bd8209cd948409d35610de9592

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/-/commit/35fe6ad35cab43bd8209cd948409d35610de9592
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20230919/cb91d6bf/attachment-0001.html>

From gitlab at projects.sucs.org  Tue Sep 19 14:00:39 2023
From: gitlab at projects.sucs.org (GitLab)
Date: Tue, 19 Sep 2023 14:00:39 +0100
Subject: [SUCS Devel] sucs-site | Failed pipeline for master | 35fe6ad3
Message-ID: <65099b77be750_5c24c6bc777d1@gitlab.mail>



Pipeline #854 has failed!

Project: sucs-site ( https://projects.sucs.org/sucssite/sucs-site )
Branch: master ( https://projects.sucs.org/sucssite/sucs-site/-/commits/master )

Commit: 35fe6ad3 ( https://projects.sucs.org/sucssite/sucs-site/-/commit/35fe6ad35cab43bd8209cd948409d35610de9592 )
Commit Message: Fix incorrect SU URL
Commit Author: Andrew Vincent Pover ( https://projects.sucs.org/andy )

Pipeline #854 ( https://projects.sucs.org/sucssite/sucs-site/-/pipelines/854 ) triggered by Andrew Vincent Pover ( https://projects.sucs.org/andy )
had 2 failed jobs.

Job #1486 ( https://projects.sucs.org/sucssite/sucs-site/-/jobs/1486/raw )

Stage: test
Name: js-syntax-check
Job #1485 ( https://projects.sucs.org/sucssite/sucs-site/-/jobs/1485/raw )

Stage: test
Name: php-syntax-check

-- 
You're receiving this email because of your account on projects.sucs.org.



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20230919/d40bec27/attachment.html>

From gitlab at projects.sucs.org  Tue Sep 19 18:20:02 2023
From: gitlab at projects.sucs.org (Imran Hussain (@imranh))
Date: Tue, 19 Sep 2023 18:20:02 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] [signup] Let people
 enter their own names
Message-ID: <6509d8424e177_5c24f1b47819d@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
d03fde5e by Imran Hussain at 2023-09-19T17:19:58+00:00
[signup] Let people enter their own names
- - - - -


1 changed file:

- templates/signup.tpl


Changes:

=====================================
templates/signup.tpl
=====================================
@@ -55,7 +55,7 @@
         <div class="row" id="realnamediv">
             <label for="realname">{if $usertype!=2}Real Name{else}Society Name{/if}</label>
             <span class="textinput"><input type="text" id="realname" name="realname" size="30"
-                                           {if $mode=='re-form'}value='{$fields.realname}'{/if} {if $usertype==1}readonly{/if}/></span>
+                                           {if $mode=='re-form'}value='{$fields.realname}'{/if} {if $usertype==0}readonly{/if}/></span>
 
             <div id="realnamemessage"{if $mode=='re-form'}{if isset($errors.realname)}
                  style="color:red; float:right; clear:right;">{$errors.realname}{else} style="color:green; float:right;



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/-/commit/d03fde5edb8e667eb581db3d498c70ad12c5a796

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/-/commit/d03fde5edb8e667eb581db3d498c70ad12c5a796
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20230919/26031c15/attachment-0001.html>

From gitlab at projects.sucs.org  Tue Sep 19 18:26:13 2023
From: gitlab at projects.sucs.org (Imran Hussain (@imranh))
Date: Tue, 19 Sep 2023 18:26:13 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][beta] 3 commits: Fix
 incorrect SU URL
Message-ID: <6509d9b556cd1_5c249f20783aa@gitlab.mail>



Imran Hussain pushed to branch beta at sucssite / sucs-site


Commits:
35fe6ad3 by Andrew Vincent Pover at 2023-09-19T11:12:35+00:00
Fix incorrect SU URL
- - - - -
d03fde5e by Imran Hussain at 2023-09-19T17:19:58+00:00
[signup] Let people enter their own names
- - - - -
f5770825 by Imran Hussain at 2023-09-19T17:26:07+00:00
Merge branch &#39;master&#39; into &#39;beta&#39;

Master

See merge request sucssite/sucs-site!131
- - - - -


2 changed files:

- templates/signup.tpl
- templates/susignup.tpl


Changes:

=====================================
templates/signup.tpl
=====================================
@@ -55,7 +55,7 @@
         <div class="row" id="realnamediv">
             <label for="realname">{if $usertype!=2}Real Name{else}Society Name{/if}</label>
             <span class="textinput"><input type="text" id="realname" name="realname" size="30"
-                                           {if $mode=='re-form'}value='{$fields.realname}'{/if} {if $usertype==1}readonly{/if}/></span>
+                                           {if $mode=='re-form'}value='{$fields.realname}'{/if} {if $usertype==0}readonly{/if}/></span>
 
             <div id="realnamemessage"{if $mode=='re-form'}{if isset($errors.realname)}
                  style="color:red; float:right; clear:right;">{$errors.realname}{else} style="color:green; float:right;


=====================================
templates/susignup.tpl
=====================================
@@ -1,53 +1,53 @@
-{if $mode=='login'}
-    <form action="{$componentpath}" method="post">
-        <div class="box" style="width: 70%; margin: auto;">
-            <div class="boxhead"><h2>Membership Signup</h2></div>
-            <div class="boxcontent">
-
-                <p>Please enter your Transation ID. It can be found by logging into <a
-                            href='http://www.swansea-union.co.uk/shop/purchasehistory/'>swansea-union.com</a> and
-                    selecting purchase history.</p>
-
-                <div class="row">
-                    <label for="sid">Student Number:</label>
-                    <span class="textinput"><input type="text" size="20" name="sid" id="sid"/></span>
-                </div>
-                <div class="row">
-                    <label for="transactionID">Transaction ID:</label>
-                    <span class="textinput"><input type="text" size="20" name="transactionID"
-                                                   id="transactionID"/></span>
-                </div>
-                <div class="row"><span class="textinput">
-                <input type="submit" name="submit" value="Join"/></span>
-                </div>
-                <div class="clear"></div>
-                <div class="note">If you already have an account and wish to renew, simply buy an additional years
-                    membership from the <a href='https://sucs.org/join'>SUSU website</a>. Enter
-                    the details above and click "Join"
-                </div>
-            </div>
-            <div class="hollowfoot">
-                <div>
-                    <div></div>
-                </div>
-            </div>
-        </div>
-    </form>
-{elseif $mode=='form'}
-    <h1>Signup</h1>
-    <p>To contiune signup now click below</p>
-    <form action="{$baseurl}/signup/" method="post">
-        <input type=hidden name="signupid" id="id" value="{$id}"/>
-        <input type=hidden name="signuppw" id="pass" value="{$pass}"/>
-        <input type=hidden name="signupsid" id="sid" value="{$sid}"/>
-        <input type=submit name="submit" value="Proceed"/>
-    </form>
-{else}
-    <h1>Error</h1>
-    <div class='errorbar'>
-        <strong>Error: </strong> {$error_text}
-    </div>
-    An error occured during signup, please email, with as much information as you can provide,
-    <a href='mailto:admin at sucs.org'>admin at sucs.org</a>
-    for assistance.
-{/if}
+{if $mode=='login'}
+    <form action="{$componentpath}" method="post">
+        <div class="box" style="width: 70%; margin: auto;">
+            <div class="boxhead"><h2>Membership Signup</h2></div>
+            <div class="boxcontent">
+
+                <p>Please enter your Transation ID. It can be found by logging into <a
+                            href='http://www.swansea-union.co.uk/shop/purchasehistory/'>swansea-union.co.uk</a> and
+                    selecting purchase history.</p>
+
+                <div class="row">
+                    <label for="sid">Student Number:</label>
+                    <span class="textinput"><input type="text" size="20" name="sid" id="sid"/></span>
+                </div>
+                <div class="row">
+                    <label for="transactionID">Transaction ID:</label>
+                    <span class="textinput"><input type="text" size="20" name="transactionID"
+                                                   id="transactionID"/></span>
+                </div>
+                <div class="row"><span class="textinput">
+                <input type="submit" name="submit" value="Join"/></span>
+                </div>
+                <div class="clear"></div>
+                <div class="note">If you already have an account and wish to renew, simply buy an additional years
+                    membership from the <a href='https://sucs.org/join'>SUSU website</a>. Enter
+                    the details above and click "Join"
+                </div>
+            </div>
+            <div class="hollowfoot">
+                <div>
+                    <div></div>
+                </div>
+            </div>
+        </div>
+    </form>
+{elseif $mode=='form'}
+    <h1>Signup</h1>
+    <p>To contiune signup now click below</p>
+    <form action="{$baseurl}/signup/" method="post">
+        <input type=hidden name="signupid" id="id" value="{$id}"/>
+        <input type=hidden name="signuppw" id="pass" value="{$pass}"/>
+        <input type=hidden name="signupsid" id="sid" value="{$sid}"/>
+        <input type=submit name="submit" value="Proceed"/>
+    </form>
+{else}
+    <h1>Error</h1>
+    <div class='errorbar'>
+        <strong>Error: </strong> {$error_text}
+    </div>
+    An error occured during signup, please email, with as much information as you can provide,
+    <a href='mailto:admin at sucs.org'>admin at sucs.org</a>
+    for assistance.
+{/if}



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/-/compare/6d8b6ea7192efa308646c1b7a6bec38ba2a4ad7f...f5770825f771f05293ef544da14be77ae4f4f438

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/-/compare/6d8b6ea7192efa308646c1b7a6bec38ba2a4ad7f...f5770825f771f05293ef544da14be77ae4f4f438
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20230919/8f1d2a2d/attachment-0001.html>

From gitlab at projects.sucs.org  Tue Sep 19 18:26:45 2023
From: gitlab at projects.sucs.org (Imran Hussain (@imranh))
Date: Tue, 19 Sep 2023 18:26:45 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 4 commits: Fix
 incorrect SU URL
Message-ID: <6509d9d5f14e_5c24c8887854c@gitlab.mail>



Imran Hussain pushed to branch sucs-site at sucssite / sucs-site


Commits:
35fe6ad3 by Andrew Vincent Pover at 2023-09-19T11:12:35+00:00
Fix incorrect SU URL
- - - - -
d03fde5e by Imran Hussain at 2023-09-19T17:19:58+00:00
[signup] Let people enter their own names
- - - - -
f5770825 by Imran Hussain at 2023-09-19T17:26:07+00:00
Merge branch &#39;master&#39; into &#39;beta&#39;

Master

See merge request sucssite/sucs-site!131
- - - - -
205bedf2 by Imran Hussain at 2023-09-19T17:26:39+00:00
Merge branch &#39;beta&#39; into &#39;sucs-site&#39;

Beta

See merge request sucssite/sucs-site!132
- - - - -


2 changed files:

- templates/signup.tpl
- templates/susignup.tpl


Changes:

=====================================
templates/signup.tpl
=====================================
@@ -55,7 +55,7 @@
         <div class="row" id="realnamediv">
             <label for="realname">{if $usertype!=2}Real Name{else}Society Name{/if}</label>
             <span class="textinput"><input type="text" id="realname" name="realname" size="30"
-                                           {if $mode=='re-form'}value='{$fields.realname}'{/if} {if $usertype==1}readonly{/if}/></span>
+                                           {if $mode=='re-form'}value='{$fields.realname}'{/if} {if $usertype==0}readonly{/if}/></span>
 
             <div id="realnamemessage"{if $mode=='re-form'}{if isset($errors.realname)}
                  style="color:red; float:right; clear:right;">{$errors.realname}{else} style="color:green; float:right;


=====================================
templates/susignup.tpl
=====================================
@@ -1,53 +1,53 @@
-{if $mode=='login'}
-    <form action="{$componentpath}" method="post">
-        <div class="box" style="width: 70%; margin: auto;">
-            <div class="boxhead"><h2>Membership Signup</h2></div>
-            <div class="boxcontent">
-
-                <p>Please enter your Transation ID. It can be found by logging into <a
-                            href='http://www.swansea-union.co.uk/shop/purchasehistory/'>swansea-union.com</a> and
-                    selecting purchase history.</p>
-
-                <div class="row">
-                    <label for="sid">Student Number:</label>
-                    <span class="textinput"><input type="text" size="20" name="sid" id="sid"/></span>
-                </div>
-                <div class="row">
-                    <label for="transactionID">Transaction ID:</label>
-                    <span class="textinput"><input type="text" size="20" name="transactionID"
-                                                   id="transactionID"/></span>
-                </div>
-                <div class="row"><span class="textinput">
-                <input type="submit" name="submit" value="Join"/></span>
-                </div>
-                <div class="clear"></div>
-                <div class="note">If you already have an account and wish to renew, simply buy an additional years
-                    membership from the <a href='https://sucs.org/join'>SUSU website</a>. Enter
-                    the details above and click "Join"
-                </div>
-            </div>
-            <div class="hollowfoot">
-                <div>
-                    <div></div>
-                </div>
-            </div>
-        </div>
-    </form>
-{elseif $mode=='form'}
-    <h1>Signup</h1>
-    <p>To contiune signup now click below</p>
-    <form action="{$baseurl}/signup/" method="post">
-        <input type=hidden name="signupid" id="id" value="{$id}"/>
-        <input type=hidden name="signuppw" id="pass" value="{$pass}"/>
-        <input type=hidden name="signupsid" id="sid" value="{$sid}"/>
-        <input type=submit name="submit" value="Proceed"/>
-    </form>
-{else}
-    <h1>Error</h1>
-    <div class='errorbar'>
-        <strong>Error: </strong> {$error_text}
-    </div>
-    An error occured during signup, please email, with as much information as you can provide,
-    <a href='mailto:admin at sucs.org'>admin at sucs.org</a>
-    for assistance.
-{/if}
+{if $mode=='login'}
+    <form action="{$componentpath}" method="post">
+        <div class="box" style="width: 70%; margin: auto;">
+            <div class="boxhead"><h2>Membership Signup</h2></div>
+            <div class="boxcontent">
+
+                <p>Please enter your Transation ID. It can be found by logging into <a
+                            href='http://www.swansea-union.co.uk/shop/purchasehistory/'>swansea-union.co.uk</a> and
+                    selecting purchase history.</p>
+
+                <div class="row">
+                    <label for="sid">Student Number:</label>
+                    <span class="textinput"><input type="text" size="20" name="sid" id="sid"/></span>
+                </div>
+                <div class="row">
+                    <label for="transactionID">Transaction ID:</label>
+                    <span class="textinput"><input type="text" size="20" name="transactionID"
+                                                   id="transactionID"/></span>
+                </div>
+                <div class="row"><span class="textinput">
+                <input type="submit" name="submit" value="Join"/></span>
+                </div>
+                <div class="clear"></div>
+                <div class="note">If you already have an account and wish to renew, simply buy an additional years
+                    membership from the <a href='https://sucs.org/join'>SUSU website</a>. Enter
+                    the details above and click "Join"
+                </div>
+            </div>
+            <div class="hollowfoot">
+                <div>
+                    <div></div>
+                </div>
+            </div>
+        </div>
+    </form>
+{elseif $mode=='form'}
+    <h1>Signup</h1>
+    <p>To contiune signup now click below</p>
+    <form action="{$baseurl}/signup/" method="post">
+        <input type=hidden name="signupid" id="id" value="{$id}"/>
+        <input type=hidden name="signuppw" id="pass" value="{$pass}"/>
+        <input type=hidden name="signupsid" id="sid" value="{$sid}"/>
+        <input type=submit name="submit" value="Proceed"/>
+    </form>
+{else}
+    <h1>Error</h1>
+    <div class='errorbar'>
+        <strong>Error: </strong> {$error_text}
+    </div>
+    An error occured during signup, please email, with as much information as you can provide,
+    <a href='mailto:admin at sucs.org'>admin at sucs.org</a>
+    for assistance.
+{/if}



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/-/compare/0ded7b1d2a1bcdaaf016bdc2e4140a83e9a2f62c...205bedf20834ef10061be9aeb3d56a2dc04a224f

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/-/compare/0ded7b1d2a1bcdaaf016bdc2e4140a83e9a2f62c...205bedf20834ef10061be9aeb3d56a2dc04a224f
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20230919/bdf774ae/attachment-0001.html>