Skip to content

Commit b8661d8

Browse files
robertskyrobertsky
committed
Merge pull request #132 from hackerspacesg/fix/adjust_content_for_ssl
Fix/adjust content for ssl
2 parents 216ff90 + 78fec3a commit b8661d8

File tree

7 files changed

+65
-67
lines changed

7 files changed

+65
-67
lines changed

‎contents/about/_index/main.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ HSG was Singapore's first co-working space. Since we launched, many more have ap
1313
- Makerbot [Cupcake CNC 3D printer](/cupcake)
1414
- Flashforge Creator 3D printer
1515
- [RIPE Atlas Probe](https://atlas.ripe.net/probes/14603/)
16-
- [Kitchen](http://hackerspaces.org/wiki/The_Kitchen_Pattern) — fridge, freezer, dishwasher, microwave and toaster ovens
17-
- [Shower](http://hackerspaces.org/wiki/The_Shower_Pattern)
16+
- [Kitchen](https://hackerspaces.org/wiki/The_Kitchen_Pattern) — fridge, freezer, dishwasher, microwave and toaster ovens
17+
- [Shower](https://hackerspaces.org/wiki/The_Shower_Pattern)
1818
- [Development boards bank](/DevBoards)
1919

2020
## Press Mentions

‎contents/calendar/_index/main.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To arrange an event:
5252
- A good way to do this is usually to post to the [HackerspaceSG Google Group](https://groups.google.com/forum/#!forum/hackerspacesg).
5353
- Note that it is not enough to find a member who acknowledges that your event is a good idea; you will need them to agree explicitly towards hosting your event and making the booking request with the event officers.
5454
- Wait until your host confirms that they've booked a calendar slot before you invite your guests or announce HackerspaceSG as a venue.
55-
- If you are planning to host events on a regular basis, please consider [becoming a member](http://hackerspace.sg/membership/).
55+
- If you are planning to host events on a regular basis, please consider [becoming a member](/membership/).
5656

5757
## Hosting Member
5858

@@ -66,7 +66,7 @@ Please don't shirk these responsibilities. Putting other members in the situatio
6666

6767
To host an event:
6868

69-
- Locate a free spot on the [calendar](http://hackerspace.sg/calendar/) that is at least a week - preferably somewhat more than a week - from now
69+
- Locate a free spot on the [calendar](/calendar/) that is at least a week - preferably somewhat more than a week - from now
7070
- Email the [events officers](mailto:events@hackerspace.sg) requesting the slot:
7171
1. Provide a title for the event
7272
1. Provide a preferred date and time (if any) and intended duration of the event

‎contents/connect/_index/main.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ be a paid member of HSG. This is the best way to contact the HSG community.
77

88
# <abbr title="Internet Relay Chat">IRC</abbr>
99

10-
<irc://irc.freenode.net/hackerspacesg> or <http://hackerspace.sg/chat/>
10+
<irc://irc.freenode.net/hackerspacesg> or [https://hackerspace.sg/chat/](/chat/)
1111

1212
# Facebook
1313

‎htaccess‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Redirect /calendar/hackerspacesg-events http://hackerspace.sg/calendar
1+
Redirect /calendar/hackerspacesg-events https://hackerspace.sg/calendar
22
Redirect gone /calendar/geektechdevdesign-events
3-
Redirect /calendar/rojak-calendar http://hackerspace.sg/calendar
4-
Redirect /readme-txt/membership/ http://hackerspace.sg/membership
3+
Redirect /calendar/rojak-calendar https://hackerspace.sg/calendar
4+
Redirect /readme-txt/membership/ https://hackerspace.sg/membership
55
Redirect gone /intertubes/
6-
Redirect /readme-txt/donations/ http://hackerspace.sg/membership
7-
Redirect /about-us/ http://hackerspace.sg/about
8-
Redirect /social/location/ http://hackerspace.sg/location
6+
Redirect /readme-txt/donations/ https://hackerspace.sg/membership
7+
Redirect /about-us/ https://hackerspace.sg/about
8+
Redirect /social/location/ https://hackerspace.sg/location
99
Redirect /chat https://scrollback.io/hackerspacesg/
1010
Redirect gone /feed
1111
Redirect gone /rss.xml

‎templates/donations.html‎

Lines changed: 54 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,56 @@
11
<div class="box1 clearfix">
2-
<div class="post clearfix">
2+
<div class="post clearfix">
33

4-
<h2 class="hd-page">Donations</h2>
5-
6-
<p><span style="color: #000000;">We currently accept monetary donations as well as furniture and equipment that may been suitable for the Hackerspace.</span></p>
7-
<p><span style="color: #000000;">For monetary donations, we accept cash that can be deposited into our tip jar. We also accept cheques made payable to Hackerspace.SG Pte Ltd. <del datetime="2012-01-15T19:15:58+00:00">Donations via Paypal will be up once we clear some administrative hurdles. </del></span></p>
8-
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
9-
<input type="hidden" name="cmd" value="_s-xclick"><br>
10-
<input type="hidden" name="hosted_button_id" value="RUE9YMLFF5YD6">
11-
<p></p>
12-
<table>
13-
<tbody>
14-
<tr>
15-
<td><input type="hidden" name="on0" value="Donation types">Donation types</td>
16-
</tr>
17-
<tr>
18-
<td>
19-
<h3>Paypal</h3>
20-
<select name="os0">
21-
<option value="Level 1">Level 1 $10.00 SGD</option>
22-
<option value="Level 2">Level 2 $20.00 SGD</option>
23-
<option value="Level 3">Level 3 $50.00 SGD</option>
24-
<option value="Level 4">Level 4 $77.00 SGD</option>
25-
<option value="Level 5">Level 5 $88.00 SGD</option>
26-
<option value="Level 6">Level 6 $200.00 SGD</option>
27-
<option value="Level 7">Level 7 $500.00 SGD</option>
28-
<option value="Level 8">Level 8 $777.00 SGD</option>
29-
<option value="Level 9">Level 9 $888.00 SGD</option>
30-
<option value="Level 10">Level 10 $1,337.00 SGD</option>
31-
</select>
32-
</td>
33-
</tr>
34-
</tbody>
35-
</table>
36-
<p><input type="hidden" name="currency_code" value="SGD"><br>
37-
<input type="image" src="https://www.paypalobjects.com/en_GB/SG/i/btn/btn_buynowCC_LG.gif" border="0" name="submit" alt="PayPal — The safer, easier way to pay online."><br>
38-
<img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1">
39-
</p>
40-
</form>
41-
<p></p><h3 style="height: 50px; vertical-align: middle;"><img src="http://bitcoin.org/img/opengraph.png" style="width: 50px; height: 50px; float: left"><br>
42-
itcoin</h3>
43-
<p></p>
44-
<p></p>
45-
<p>address: 16YGPs2FoveZFHXPGE9XZjH2s9E9vSkFZG
46-
</p>
47-
<p>
48-
<img src="https://blockchain.info/qr?data=16YGPs2FoveZFHXPGE9XZjH2s9E9vSkFZG&amp;size=200">
49-
</p>
50-
<p><span style="color: #000000;"><br>
51-
</span></p>
52-
<p>Another convenient way to support us is to simply just consume drinks on alcohol from our fridge and tip our donations jar accordingly <img src="http://hackerspace.sg/wp-includes/images/smilies/icon_smile.gif" alt=":)" class="wp-smiley"> </p>
53-
<p></p>
54-
<p><span style="color: #000000;">For other donations, please drop a mail to our google group.</span></p>
55-
56-
<p><a class="post-edit-link" href="http://hackerspace.sg/wp-admin/post.php?post=432&amp;action=edit" title="Edit Page">Edit this entry.</a></p>
57-
</div>
58-
</div>
4+
<h2 class="hd-page">Donations</h2>
5+
6+
<p><span style="color: #000000;">We currently accept monetary donations as well as furniture and equipment that may been suitable for the Hackerspace.</span></p>
7+
<p><span style="color: #000000;">For monetary donations, we accept cash that can be deposited into our tip jar. We also accept cheques made payable to Hackerspace.SG Pte Ltd. <del datetime="2012-01-15T19:15:58+00:00">Donations via Paypal will be up once we clear some administrative hurdles. </del></span></p>
8+
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
9+
<input type="hidden" name="cmd" value="_s-xclick"><br>
10+
<input type="hidden" name="hosted_button_id" value="RUE9YMLFF5YD6">
11+
<p></p>
12+
<table>
13+
<tbody>
14+
<tr>
15+
<td><input type="hidden" name="on0" value="Donation types">Donation types</td>
16+
</tr>
17+
<tr>
18+
<td>
19+
<h3>Paypal</h3>
20+
<select name="os0">
21+
<option value="Level 1">Level 1 $10.00 SGD</option>
22+
<option value="Level 2">Level 2 $20.00 SGD</option>
23+
<option value="Level 3">Level 3 $50.00 SGD</option>
24+
<option value="Level 4">Level 4 $77.00 SGD</option>
25+
<option value="Level 5">Level 5 $88.00 SGD</option>
26+
<option value="Level 6">Level 6 $200.00 SGD</option>
27+
<option value="Level 7">Level 7 $500.00 SGD</option>
28+
<option value="Level 8">Level 8 $777.00 SGD</option>
29+
<option value="Level 9">Level 9 $888.00 SGD</option>
30+
<option value="Level 10">Level 10 $1,337.00 SGD</option>
31+
</select>
32+
</td>
33+
</tr>
34+
</tbody>
35+
</table>
36+
<p><input type="hidden" name="currency_code" value="SGD"><br>
37+
<input type="image" src="https://www.paypalobjects.com/en_GB/SG/i/btn/btn_buynowCC_LG.gif" border="0" name="submit" alt="PayPal — The safer, easier way to pay online."><br>
38+
<img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1">
39+
</p>
40+
</form>
41+
<p></p><h3 style="height: 50px; vertical-align: middle;"><img src="http://bitcoin.org/img/opengraph.png" style="width: 50px; height: 50px; float: left"><br>
42+
itcoin</h3>
43+
<p></p>
44+
<p></p>
45+
<p>address: 16YGPs2FoveZFHXPGE9XZjH2s9E9vSkFZG
46+
</p>
47+
<p>
48+
<img src="https://blockchain.info/qr?data=16YGPs2FoveZFHXPGE9XZjH2s9E9vSkFZG&amp;size=200">
49+
</p>
50+
<p><span style="color: #000000;"><br>
51+
</span></p>
52+
<p>Another convenient way to support us is to simply just consume drinks on alcohol from our fridge and tip our donations jar accordingly. 😁</p>
53+
<p></p>
54+
<p><span style="color: #000000;">For other donations, please drop a mail to our google group.</span></p>
55+
</div>
56+
</div>

‎templates/membership/MembershipAgreement.odg‎

20.8 KB
Binary file not shown.

‎templates/membership/MembershipAgreement.pdf‎

-4.55 KB
Binary file not shown.

0 commit comments

Comments
 (0)