Merge lp:~raoul-snyman/ubuntu-za/mailing-list into lp:ubuntu-za

Proposed by Raoul Snyman on 2015-02-03
Status: Merged
Merged at revision: 9
Proposed branch: lp:~raoul-snyman/ubuntu-za/mailing-list
Merge into: lp:ubuntu-za
Diff against target: 59 lines (+40/-1)
2 files modified
pages/contact.rst (+30/-1)
themes/ubuntuza/assets/css/theme.css (+10/-0)
To merge this branch: bzr merge lp:~raoul-snyman/ubuntu-za/mailing-list
Reviewer Review Type Date Requested Status
Gustav H Meyer 2015-02-03 Approve on 2015-02-03
Review via email: mp+248432@code.launchpad.net

Description of the Change

Add a section on the contact page for subscribing to the mailing list.

To post a comment you must log in.
Gustav H Meyer (inetpro) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pages/contact.rst'
2--- pages/contact.rst 2015-01-05 20:25:39 +0000
3+++ pages/contact.rst 2015-02-03 18:21:23 +0000
4@@ -6,5 +6,34 @@
5 .. description:
6 .. type: text
7
8+Mailing List
9+------------
10+One of our primary ways of communicating is via our mailing list. To subscribe to the mailing list, enter your e-mail
11+below and you'll receive a mail to confirm your subscription to the mailing list. If you just want to browse through the
12+e-mails, take a look at the `mailing list archives <https://lists.ubuntu.com/archives/ubuntu-za/>`_.
13+
14+.. raw:: html
15+
16+ <div class="row subscribe-form">
17+ <div class="col-md-3">&nbsp;</div>
18+ <div class="col-md-6 well">
19+ <p><strong>Subscribe to <code class="reverse">moc.utnubu.stsil@az-utnubu</code></strong></p>
20+ <form role="form" method="POST" action="https://lists.ubuntu.com/mailman/subscribe/ubuntu-za" class="form-inline">
21+ <div class="form-group">
22+ <label for="email" class="control-label">E-mail:</label>
23+ <input type="email" name="email" class="form-control" id="email" placeholder="test@example.com">
24+ </div>
25+ <div class="form-group">
26+ <button type="submit" class="btn btn-primary" name="email-button" value="Subscribe">Subscribe</button>
27+ </div>
28+ </form>
29+ </div>
30+ <div class="col-md-3">&nbsp;</div>
31+ </div>
32+
33+
34+IRC
35+---
36 The Ubuntu-ZA Local Community prefers to hang out in IRC, where we can discuss Ubuntu, Linux, open source software, and
37-a host of other things. Please join us in `IRC </irc.html>`_!
38\ No newline at end of file
39+a host of other things. Please join us in `IRC </irc.html>`_!
40+
41
42=== modified file 'themes/ubuntuza/assets/css/theme.css'
43--- themes/ubuntuza/assets/css/theme.css 2014-12-18 19:58:47 +0000
44+++ themes/ubuntuza/assets/css/theme.css 2015-02-03 18:21:23 +0000
45@@ -64,3 +64,13 @@
46 -webkit-box-shadow: 0 0 3px #888;
47 box-shadow: 0 0 3px #888;
48 }
49+
50+code.reverse {
51+ unicode-bidi: bidi-override;
52+ direction: rtl;
53+}
54+
55+.subscribe-form {
56+ margin-bottom: 1em;
57+ text-align: center;
58+}
59\ No newline at end of file

Subscribers

People subscribed via source and target branches