[Xfce4-commits] <www:nick/gettext> Merge the community pages.
Jérôme Guelfucci
noreply at xfce.org
Tue Dec 7 20:50:01 CET 2010
Updating branch refs/heads/nick/gettext
to b9830b1b7ad090d3c36ed4f6cf8158214ab4a9e8 (commit)
from ee76c11eb19d62601af924a9b1a37aadcc53a7da (commit)
commit b9830b1b7ad090d3c36ed4f6cf8158214ab4a9e8
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date: Tue Dec 7 20:47:28 2010 +0100
Merge the community pages.
There is no point in having three 2-liners pages, put everything in the
same place.
pages/community/index.php | 117 +++++++++++++++++++++++++++++++++++++++++++-
pages/community/irc.php | 5 --
pages/community/lists.php | 88 ----------------------------------
pages/community/nav.php | 4 +-
4 files changed, 115 insertions(+), 99 deletions(-)
diff --git a/pages/community/index.php b/pages/community/index.php
index da698bb..efef6e4 100644
--- a/pages/community/index.php
+++ b/pages/community/index.php
@@ -1,11 +1,122 @@
-<?php $head['title'] = R_('Community') ?>
+<?php
+
+$head['title'] = R_('Community');
+
+$toc['anchors'] = array (
+ 'irc' => R_('IRC'),
+ 'mail' => R_('Mailing lists'),
+ 'forum' => R_('Forums'),
+ 'identi' => R_('Identi.ca Xfce group'));
+
+?>
<h1><?php echo $head['title'] ?></h1>
<p>
- <?php E_('If you were not able to solve your problem by using the documentation on this website, the Xfce communities are a good place to get help or to share your ideas.') ?>
+ <?php E_('Whether it be to solve a problem or to contribute in any way, the Xfce communities are a good place to get help or to share your ideas. You might also want to have a look at the communities of the different distributions which provide Xfce.') ?>
+</p>
+
+<h2 id="irc"><?php E_('IRC') ?></h2>
+
+<p>
+ <?php E_('If you have a problem that you cannot resolve, you might want to try asking a question in our IRC channel <a href="irc://irc.freenode.net/#xfce">#xfce on irc.freenode.net</a>. The channel has several active users. It is recommended that you consult the <a href="http://docs.xfce.org/" class="external">documentation</a> about your problem before asking your question.') ?>
+</p>
+
+<h2 id"mail"><?php E_('Mailing lists') ?></h2>
+
+<p>
+ <?php E_('<strong>NOTE:</strong> In order to post to these lists, you must first subscribe.') ?>
+</p>
+
+<table>
+ <tr>
+ <th><?php E_('List') ?></th>
+ <th><?php E_('Description') ?></th>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/xfce/">xfce</a></td>
+ <td><?php E_('Discussion list for users of Xfce.') ?></td>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/xfce-announce/">xfce-announce</a></td>
+ <td><?php E_('Announcements of new versions of Xfce and related projects.') ?></td>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/xfce-advocacy/">xfce-advocacy</a></td>
+ <td><?php E_('This mailing list is used as a point of contact for people interested in promoting Xfce.') ?></td>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/xfce-i18n/">xfce-i18n</a></td>
+ <td><?php E_('To coordinate the translation of Xfce into new languages. See also the <a href="/development/translations">translations</a> page.') ?></td>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/xfce-i18n-de">xfce-i18n-de</a></td>
+ <td><?php E_('To coordinate the German translation of Xfce.') ?></td>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/xfce4-dev/">xfce4-dev</a></td>
+ <td><?php E_('A mailing list for developers of Xfce.') ?></td>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/xfce4-commits/">xfce4-commits</a></td>
+ <td><?php E_('To be notified of Xfce commits (including goodies and other modules).') ?></td>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/goodies-dev/">goodies-dev</a></td>
+ <td><?php E_('Xfce Goodies development discussion.') ?></td>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/xfce-bugs/">xfce-bugs</a></td>
+ <td><?php E_('E-mail address for general Xfce bugs. Bugs should be reported and discussed in the <a href="http://bugzilla.xfce.org" class="external">bug tracker</a>.') ?></td>
+ </tr>
+ <tr>
+ <td><a href="http://foo-projects.org/mailman/listinfo/thunar-dev/">thunar-dev</a></td>
+ <td><?php E_('A mailing list for development of the Thunar file manager.') ?></td>
+ </tr>
+</table>
+
+<h3><?php E_('Search the mailing lists') ?></h3>
+
+<div id="cse">Loading</div>
+<script src="http://www.google.com/jsapi" type="text/javascript"></script>
+<script type="text/javascript">
+ google.load('search', '1', {language : 'en'});
+ google.setOnLoadCallback(function() {
+ var customSearchControl = new google.search.CustomSearchControl('008920933163277390313:ia4uyxqfszw');
+ customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+ customSearchControl.setNoResultsString('<?php E_('No results found in mailing lists') ?>');
+
+ customSearchControl.draw('cse');
+ }, true);
+</script>
+<style type="text/css">
+ .gs-webResult.gs-result a.gs-title:link,
+ .gs-webResult.gs-result a.gs-title:link b {
+ color: #0066cc;
+ }
+ .gs-webResult.gs-result a.gs-title:visited,
+ .gs-webResult.gs-result a.gs-title:visited b {
+ color: #0066cc;
+ }
+ .gs-webResult.gs-result a.gs-title:hover,
+ .gs-webResult.gs-result a.gs-title:hover b {
+ color: #ff0000;
+ }
+ .gsc-cursor-page {
+ color: #0066cc;
+ }
+ a.gsc-trailing-more-results:link {
+ color: #0066cc;
+ }
+</style>
+
+<h2 id="forum"><?php E_('Forums') ?></h2>
+
+<p>
+ <?php E_('For users who prefer forums, the <a href="http://forum.xfce.org/" class="external">Xfce Forum</a> is the place to be. Active contributors will be able to help you, but please do not use it for bug reports.') ?>
</p>
+<h2 id="identi"><?php E_('Identi.ca Xfce group') ?></h2>
+
<p>
- <?php E_('Subscribe to one of the <a href="/community/lists">mailing lists</a>, search the Xfce <a href="http://wiki.xfce.org/" target="_blank">wiki</a>, visit the <a href="http://forum.xfce.org/" target="_blank">forum</a> or join the Xfce <a href="/community/irc">IRC channel</a> to collaborate with other Xfce users.') ?>
+ <?php E_('<a href="http://identi.ca/group/xfce" class="external">The Identi.ca Xfce group</a> will allow you to get in touch with many Xfce users and to get the latest Xfce news.') ?>
</p>
diff --git a/pages/community/irc.php b/pages/community/irc.php
deleted file mode 100644
index de79670..0000000
--- a/pages/community/irc.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $head['title'] = R_('IRC') ?>
-
-<h1><?php echo $head['title'] ?></h1>
-
-<p><?php E_('If you have a problem that you cannot resolve, you might want to try asking a question in our IRC channel <a href="irc://irc.freenode.net/#xfce">#xfce on irc.freenode.net</a>. The channel has several active users. It is recommended that you consult the <a href="/documentation">documentation</a> about your problem before asking your question.') ?></p>
diff --git a/pages/community/lists.php b/pages/community/lists.php
deleted file mode 100644
index a2ce669..0000000
--- a/pages/community/lists.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php $head['title'] = R_('Mailing Lists') ?>
-
-<h1><?php echo $head['title'] ?></h1>
-
-<p>
- <?php E_('<strong>NOTE:</strong> In order to post to these lists, you must first subscribe.') ?>
-</p>
-
-<table>
- <tr>
- <th><?php E_('List') ?></th>
- <th><?php E_('Description') ?></th>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/xfce/">xfce</a></td>
- <td><?php E_('Discussion list for users of Xfce.') ?></td>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/xfce-announce/">xfce-announce</a></td>
- <td><?php E_('Announcements of new versions of Xfce and related projects.') ?></td>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/xfce-advocacy/">xfce-advocacy</a></td>
- <td><?php E_('This mailing list is used as a point of contact for people interested in promoting Xfce.') ?></td>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/xfce-i18n/">xfce-i18n</a></td>
- <td><?php E_('To coordinate the translation of Xfce into new languages. See also the <a href="/development/translations">translations</a> page.') ?></td>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/xfce-i18n-de">xfce-i18n-de</a></td>
- <td><?php E_('To coordinate the German translation of Xfce.') ?></td>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/xfce4-dev/">xfce4-dev</a></td>
- <td><?php E_('A mailing list for developers of Xfce.') ?></td>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/xfce4-commits/">xfce4-commits</a></td>
- <td><?php E_('To be notified of Xfce commits (including goodies and other modules).') ?></td>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/goodies-dev/">goodies-dev</a></td>
- <td><?php E_('Xfce Goodies development discussion.') ?></td>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/xfce-bugs/">xfce-bugs</a></td>
- <td><?php E_('E-mail address for general Xfce bugs. Bugs should be reported and discussed in the <a href="http://bugzilla.xfce.org" target="_blank" class="external">bug tracker</a>.') ?></td>
- </tr>
- <tr>
- <td><a href="http://foo-projects.org/mailman/listinfo/thunar-dev/">thunar-dev</a></td>
- <td><?php E_('A mailing list for development of the Thunar file manager.') ?></td>
- </tr>
-</table>
-
-<h2><?php E_('Search the mailing lists') ?></h2>
-
-<div id="cse">Loading</div>
-<script src="http://www.google.com/jsapi" type="text/javascript"></script>
-<script type="text/javascript">
- google.load('search', '1', {language : 'en'});
- google.setOnLoadCallback(function() {
- var customSearchControl = new google.search.CustomSearchControl('008920933163277390313:ia4uyxqfszw');
- customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
- customSearchControl.setNoResultsString('<?php E_('No results found in mailing lists') ?>');
-
- customSearchControl.draw('cse');
- }, true);
-</script>
-<style type="text/css">
- .gs-webResult.gs-result a.gs-title:link,
- .gs-webResult.gs-result a.gs-title:link b {
- color: #0066cc;
- }
- .gs-webResult.gs-result a.gs-title:visited,
- .gs-webResult.gs-result a.gs-title:visited b {
- color: #0066cc;
- }
- .gs-webResult.gs-result a.gs-title:hover,
- .gs-webResult.gs-result a.gs-title:hover b {
- color: #ff0000;
- }
- .gsc-cursor-page {
- color: #0066cc;
- }
- a.gsc-trailing-more-results:link {
- color: #0066cc;
- }
-</style>
diff --git a/pages/community/nav.php b/pages/community/nav.php
index acdee28..2be459a 100644
--- a/pages/community/nav.php
+++ b/pages/community/nav.php
@@ -1,9 +1,7 @@
<?php
$toc['menu'] = array (
- 'community' => R_('Community'),
- 'community/lists' => R_('Mailing Lists'),
- 'community/irc' => R_('IRC'));
+ 'community' => R_('Community'));
$toc['external'] = array (
'http://forum.xfce.org' => R_('Forum'),
More information about the Xfce4-commits
mailing list