[SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 7 commits: Fix #22.

[Imran Hussain]

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


Commits:
8e84a71b by Imran Hussain at 2015-10-21T12:10:28Z
Fix #22.

Remove the extra /Community from stream page urls

- - - - -
124f33bb by Imran Hussain at 2015-10-21T13:26:47Z
Fix a spacing issue

- - - - -
e9e2a380 by Imran Hussain at 2015-10-21T13:27:07Z
Merge branch 'master' of projects.sucs.org:sucssite/sucs-site

- - - - -
67c8f9e0 by Imran Hussain at 2015-10-26T14:43:37Z
Remove a dead page from the sucssite

- - - - -
457405cc by Imran Hussain at 2015-11-05T10:48:28Z
Add the position of gaming officer to the election system

- - - - -
fc8a4561 by Imran Hussain at 2015-11-05T11:12:07Z
Merge branch 'master' into beta.

Gitlab is a bit borked atm so a manual cli merge is needed

- - - - -
ed2617c1 by Imran Hussain at 2015-11-05T12:06:07Z
Merge branch 'beta' into sucs-site

- - - - -


4 changed files:

- database.sql
- static/Community/Stream.txt
- − static/Knowledge/Help/scanner.txt
- templates/members.tpl


Changes:

=====================================
database.sql
=====================================
--- a/database.sql
+++ b/database.sql
@@ -204,6 +204,7 @@ CREATE TABLE election_votes (
     treasurer text,
     secretary text,
     publicity text,
+    gaming text,
     ipaddress text
 );
 


=====================================
static/Community/Stream.txt
=====================================
--- a/static/Community/Stream.txt
+++ b/static/Community/Stream.txt
@@ -22,7 +22,7 @@
 </ul>
 <p>
 To view the stream in an external media player <em>(e.g VLC)</em> 
-<a href="../Community/Stream/External">Click Here for instructions</a><em><br /></em></p>
-<p>All streams are currently FLV format. If you have any problems, please read the <a href="../Community/Stream/FAQ">FAQ</a></p>
+<a href="../Stream/External">Click Here for instructions</a><em><br /></em></p>
+<p>All streams are currently FLV format. If you have any problems, please read the <a href="../Stream/FAQ">FAQ</a></p>
 <ul>
 </ul>
\ No newline at end of file


=====================================
static/Knowledge/Help/scanner.txt deleted
=====================================
--- a/static/Knowledge/Help/scanner.txt
+++ /dev/null
@@ -1 +0,0 @@
-Page under construction


=====================================
templates/members.tpl
=====================================
--- a/templates/members.tpl
+++ b/templates/members.tpl
@@ -25,8 +25,7 @@
                         {if $member.website }
                             <dt>Website</dt>
                             <dd>
-                                <a href="http://sucs.org/~{$member.uid|escape:'url'}/">http://sucs.org/~{$member.uid|escape:'url'}
-                                    /</a></dd>
+                                <a href="http://sucs.org/~{$member.uid|escape:'url'}/">http://sucs.org/~{$member.uid|escape:'url'}/</a></dd>
                         {/if}
                         {if isset($member.project) }
                             <dt>Project</dt>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/594f64debe93c47f29381c892fe8fec09eccee0c...ed2617c1a6b514b82d4e8d8ba440e1c91b9a317c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20151105/548dc84b/attachment.html>