[Xfce4-commits] <www:nick/gettext> Create 'get involved' section, move stuff around.

Nick Schermer noreply at xfce.org
Sat Dec 18 22:34:01 CET 2010


Updating branch refs/heads/nick/gettext
         to dda420c585889a1e7ff9778bd97ca933051f32ed (commit)
       from 65c94ad23ac593154a1fcecb216bc4b2a02ad052 (commit)

commit dda420c585889a1e7ff9778bd97ca933051f32ed
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Dec 18 22:31:27 2010 +0100

    Create 'get involved' section, move stuff around.

 .../releasemodel/code-freeze-branching.png         |  Bin 37391 -> 37391 bytes
 .../releasemodel/code-freeze-branching.svg         |    0
 .../releasemodel/example-release-cycle.png         |  Bin 44431 -> 44431 bytes
 .../releasemodel/example-release-cycle.svg         |    0
 .../releasemodel/feature-branching.png             |  Bin 40247 -> 40247 bytes
 .../releasemodel/feature-branching.svg             |    0
 pages/about/nav.php                                |    1 +
 pages/{development => about}/releasemodel.php      |   12 ++--
 pages/community/index.php                          |    2 +-
 pages/development/index.php                        |   52 --------------------
 pages/development/nav.php                          |   13 -----
 pages/download/building.php                        |    4 +-
 pages/download/index.php                           |    2 +-
 pages/getinvolved/index.php                        |   40 +++++++++++++++
 pages/getinvolved/nav.php                          |   17 ++++++
 .../translate.php => getinvolved/translation.php}  |    2 +-
 pages/header.php                                   |    2 +-
 style/base.css                                     |    1 +
 18 files changed, 71 insertions(+), 77 deletions(-)

diff --git a/images/development/releasemodel/code-freeze-branching.png b/images/about/releasemodel/code-freeze-branching.png
similarity index 100%
rename from images/development/releasemodel/code-freeze-branching.png
rename to images/about/releasemodel/code-freeze-branching.png
diff --git a/images/development/releasemodel/code-freeze-branching.svg b/images/about/releasemodel/code-freeze-branching.svg
similarity index 100%
rename from images/development/releasemodel/code-freeze-branching.svg
rename to images/about/releasemodel/code-freeze-branching.svg
diff --git a/images/development/releasemodel/example-release-cycle.png b/images/about/releasemodel/example-release-cycle.png
similarity index 100%
rename from images/development/releasemodel/example-release-cycle.png
rename to images/about/releasemodel/example-release-cycle.png
diff --git a/images/development/releasemodel/example-release-cycle.svg b/images/about/releasemodel/example-release-cycle.svg
similarity index 100%
rename from images/development/releasemodel/example-release-cycle.svg
rename to images/about/releasemodel/example-release-cycle.svg
diff --git a/images/development/releasemodel/feature-branching.png b/images/about/releasemodel/feature-branching.png
similarity index 100%
rename from images/development/releasemodel/feature-branching.png
rename to images/about/releasemodel/feature-branching.png
diff --git a/images/development/releasemodel/feature-branching.svg b/images/about/releasemodel/feature-branching.svg
similarity index 100%
rename from images/development/releasemodel/feature-branching.svg
rename to images/about/releasemodel/feature-branching.svg
diff --git a/pages/about/nav.php b/pages/about/nav.php
index 71cf373..582cf8c 100644
--- a/pages/about/nav.php
+++ b/pages/about/nav.php
@@ -7,5 +7,6 @@ $toc['menu'] = array (
 	'about/screenshots' => R_('Screenshots'),
 	'about/credits' => R_('Credits'),
 	'about/press' => R_('Press'),
+	'about/releasemodel' => R_('Release Model'),
 	'about/artwork' => R_('Artwork'));
 ?>
diff --git a/pages/development/releasemodel.php b/pages/about/releasemodel.php
similarity index 96%
rename from pages/development/releasemodel.php
rename to pages/about/releasemodel.php
index 5f7c898..1bf6429 100644
--- a/pages/development/releasemodel.php
+++ b/pages/about/releasemodel.php
@@ -72,8 +72,8 @@ $toc['anchors'] = array (
 </p>
 
 <p>
-  <a href="/images/development/releasemodel/example-release-cycle.svg">
-    <img src="/images/development/releasemodel/example-release-cycle.png" title="<?php E_('Example Release Cycle') ?>" alt="" />
+  <a href="/images/about/releasemodel/example-release-cycle.svg">
+    <img src="/images/about/releasemodel/example-release-cycle.png" title="<?php E_('Example Release Cycle') ?>" alt="" />
   </a>
 </p>
 
@@ -198,8 +198,8 @@ $toc['anchors'] = array (
 </p>
 
 <p>
-  <a href="/images/development/releasemodel/feature-branching.svg">
-    <img src="/images/development/releasemodel/feature-branching.png" title="<?php E_('Development Workflow') ?>" alt="" />
+  <a href="/images/about/releasemodel/feature-branching.svg">
+    <img src="/images/about/releasemodel/feature-branching.png" title="<?php E_('Development Workflow') ?>" alt="" />
   </a>
 </p>
 
@@ -267,8 +267,8 @@ $toc['anchors'] = array (
 </p>
 
 <p>
-  <a href="/images/development/releasemodel/code-freeze-branching.svg">
-    <img src="/images/development/releasemodel/code-freeze-branching.png" title="<?php E_('Tagging and Branching for Releases') ?>" alt="" />
+  <a href="/images/about/releasemodel/code-freeze-branching.svg">
+    <img src="/images/about/releasemodel/code-freeze-branching.png" title="<?php E_('Tagging and Branching for Releases') ?>" alt="" />
   </a>
 </p>
 
diff --git a/pages/community/index.php b/pages/community/index.php
index efef6e4..82ab290 100644
--- a/pages/community/index.php
+++ b/pages/community/index.php
@@ -47,7 +47,7 @@ $toc['anchors'] = array (
   </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>
+    <td><?php E_('To coordinate the translation of Xfce into new languages. See also the <a href="/getinvolved/translate">translations</a> page.') ?></td>
   </tr>
   <tr>
     <td><a href="http://foo-projects.org/mailman/listinfo/xfce-i18n-de">xfce-i18n-de</a></td>
diff --git a/pages/development/index.php b/pages/development/index.php
deleted file mode 100644
index 814aec9..0000000
--- a/pages/development/index.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php $head['title'] = R_('Development') ?>
-
-<h1><?php echo $head['title'] ?></h1>
-<p>
-  <?php E_('Xfce is made possible thanks to the help of volunteers with all kinds of skills and talents. Coding is just one way to help – translators, documenters, and designers are also welcome! This page outlines some of the areas where you could help out.') ?>
-</p>
-
-<h2><?php E_('Xfce core') ?></h2>
-<p>
-  <?php printf (R_('Feel free to join us in developing the next release of Xfce or in helping fix bugs in existing releases. <a href="http://bugzilla.xfce.org">Bugzilla</a> and the <a href="%s">roadmap</a> are good sources of ideas on what needs some love.'), 'http://wiki.xfce.org/releng/4.8/schedule') ?>
-</p>
-
-<p>
-  <?php E_('If you are interested in more details or news about current development efforts, subscribe to the <a href="http://foo-projects.org/mailman/listinfo/xfce4-dev">development mailing list</a>. The <a href="http://wiki.xfce.org/">wiki</a> also contains a lot of useful information.') ?></p>
-
-<h2><?php E_('Translations') ?></h2>
-<p>
-  <?php E_('Xfce is translated into dozens of languages. Translations are currently managed using <a href="https://translations.xfce.org/">Transifex</a>. The <a href="https://translations.xfce.org/help/">help page</a> contains instructions on how to contribute. If you have any questions, the <a href="http://foo-projects.org/mailman/listinfo/xfce-i18n/">Xfce i18n mailing list</a> is there for you!') ?>
-</p>
-
-<h2><?php E_('Documentation') ?></h2>
-<p>
-  <?php E_('As you may have noticed, the <a href="http://docs.xfce.org>">Xfce documentation</a> needs some love! If you want to join the new documentation effort, please contact us using the <a href="http://foo-projects.org/mailman/listinfo/xfce4-dev">development mailing list</a>.') ?>
-</p>
-
-<h2><?php E_('Goodies') ?></h2>
-<p>
-  <?php E_('The <a href="http://goodies.xfce.org">Xfce goodies</a> are independent projects related to the Xfce desktop. Though they are not part of the official release, they complement and enhance the overall desktop, and they also need your help! If you want to contribute to one of these, contact that project\'s maintainer, or you could start your own pet project. The <a href="http://foo-projects.org/mailman/listinfo/goodies-dev/">Goodies development mailing list</a>is there for you if you have any questions.') ?>
-</p>
-
-
-<h2><?php E_('Xfce framework') ?></h2>
-<p>
-  <?php E_('Xfce provides a framework for developing applications that integrate well in the Xfce desktop environment. This framework also provides common and useful functionality not present in the GLib/GTK stack, further easing application development.') ?>
-</p>
-
-<p>
-  <?php E_('The <a href="http://foo-projects.org/%7Ebenny/projects/xfce4-dev-tools/">Xfce developer tools</a> provide a collection of scripts and M4 macros that are required to build the Xfce core desktop components.') ?>
-</p>
-
-<p>
-  <?php E_('The <a href="/projects/libraries/">base libraries of Xfce</a> are used by almost every Xfce application. Among other things, they provide convenience functions and specialized display widgets.') ?>
-</p>
-
-<p>
-  <?php E_('Xfce also includes <a href="http://pyxfce.xfce.org/">Python</a>, <a href="http://spuriousinterrupt.org/projects/xfce4-perl">Perl</a>, and <a href="http://xfc.xfce.org/">C++</a> bindings to its libraries.') ?>
-</p>
-
-<h2><?php E_('Artwork') ?></h2>
-<p>
-  <?php E_('The <a href="/about/artwork">Xfce Artwork</a> project needs volunteers! Design new icons, wallpapers, or window manager themes by following our step-by-step example <a href="http://wiki.xfce.org/howto">howto\'s</a>. Or see how others have customized their Xfce desktops on <a href="http://www.xfce-look.org/">Xfce Look</a>.') ?>
-</p>
diff --git a/pages/development/nav.php b/pages/development/nav.php
deleted file mode 100644
index 3506217..0000000
--- a/pages/development/nav.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-$toc['menu'] = array (
-	'development' => R_('Development'),
-	'development/translate' => R_('Translate'),
-	'development/releasemodel' => R_('Release Model'));
-
-$toc['external'] = array (
-	'http://bugzilla.xfce.org' => R_('Report a bug'),
-	'http://translations.xfce.org' => R_('Translations'),
-	'http://buildbot.xfce.org' => R_('Buildbot'));
-
-?>
diff --git a/pages/download/building.php b/pages/download/building.php
index 1160b38..a43fee6 100644
--- a/pages/download/building.php
+++ b/pages/download/building.php
@@ -53,7 +53,7 @@ $toc['anchors'] = array (
 
   <li><a href="http://archive.xfce.org/src/xfce/" class="external"><?php E_('Individual releases') ?></a>
     <p>
-      <?php E_('Each package in Xfce is allowed to make development and stable releases at any time, see the <a href="/development/releasemodel">release model</a> documentation for more information.') ?>
+      <?php E_('Each package in Xfce is allowed to make development and stable releases at any time, see the <a href="/about/releasemodel">release model</a> documentation for more information.') ?>
     </p>
   </li>
 </ul>
@@ -243,7 +243,7 @@ $toc['anchors'] = array (
 </p>
 
 <p>
-  <?php E_('To build from GIT you need need to install the xfce4-dev-tools package first, all other packages should be installed with this command:') ?>
+  <?php E_('To build from GIT you need to install the xfce4-dev-tools package first, all other packages should be installed with this command:') ?>
 </p>
 
 <p>
diff --git a/pages/download/index.php b/pages/download/index.php
index ca453b1..88dae38 100644
--- a/pages/download/index.php
+++ b/pages/download/index.php
@@ -46,7 +46,7 @@ function print_servers($path)
 
 <h2 id="individual"><?php E_('Individual releases') ?></h2>
 <p>
-  <?php E_('Each package in Xfce can make idividual stable or development releases, including the core packages (as discribed in the <a href="/development/releasemodel">release model</a>). You can follow the announcements of the releases on the <a href="/community/lists">Xfce users mailing list</a>, watch the <a href="http://releases.xfce.org/feeds/project/">release feeds</a> or follow the Xfce <a href="http://identi.ca/xfce">identi.ca channel</a>.') ?>
+  <?php E_('Each package in Xfce can make idividual stable or development releases, including the core packages (as discribed in the <a href="/about/releasemodel">release model</a>). You can follow the announcements of the releases on the <a href="/community/lists">Xfce users mailing list</a>, watch the <a href="http://releases.xfce.org/feeds/project/">release feeds</a> or follow the Xfce <a href="http://identi.ca/xfce">identi.ca channel</a>.') ?>
 </p>
 
 <ul>
diff --git a/pages/getinvolved/index.php b/pages/getinvolved/index.php
new file mode 100644
index 0000000..1e2cb92
--- /dev/null
+++ b/pages/getinvolved/index.php
@@ -0,0 +1,40 @@
+<?php $head['title'] = R_('Get Involved') ?>
+
+<h1><?php echo $head['title'] ?></h1>
+<p>
+  <?php E_('Welcome to the Xfce community. By joining our team, you will be part of an international effort by hundreds of people working to deliver a stunning Free Software computing experience. You will meet new friends, learn new skills and make a difference to millions of users while working with people from all around the globe. There are many different ways you can become part of this, just read on and pick an area which interests you or seems challenging.') ?>
+</p>
+
+<p>
+  <?php E_('Possible tasks include testing, bug reporting; writing code, developing artwork, documentation or translations; or spreading the word and helping out with promotion and marketing both on line and at tradeshows and conferences.') ?>
+</p>
+
+<h2><a href="/getinvolved/documention"><?php E_('Documentation') ?></a></h2>
+<p>
+  <?php E_('There\'s lots of people using and testing Xfce. By providing useful and up-to-date documentation, you will make a big impact on helping people understand how to make the most of the Xfce Desktop Environement.') ?>
+</p>
+
+<h2><a href="/getinvolved/translation"><?php E_('Translation') ?></a></h2>
+<p>
+  <?php E_('Are you fluent in multiple languages? By contributing your translations of text to the Xfce Desktop Environement, you will help Xfce be a better part of the global market and more accessible to the millions of potential users out there.') ?>
+</p>
+
+<h2><a href="/getinvolved/development"><?php E_('Development') ?></a></h2>
+<p>
+  <?php E_('By becoming a developer, you can make a big difference while enjoying a challenging and fun experience. You\'ll learn to be a better coder, you will get to implement new features and defeat daunting bugs, creating a stunning product, all the while collaborating with people from all around the world.') ?>
+</p>
+
+<h2><a href="/getinvolved/promotion"><?php E_('Promotion') ?></a></h2>
+<p>
+  <?php E_('') ?>
+</p>
+
+<h2><a href="/getinvolved/testing"><?php E_('Testing') ?></a></h2>
+<p>
+  <?php E_('') ?>
+</p>
+
+<h2><a href="/getinvolved/bugreporting"><?php E_('Bug Reporting') ?></a></h2>
+<p>
+  <?php E_('') ?>
+</p>
diff --git a/pages/getinvolved/nav.php b/pages/getinvolved/nav.php
new file mode 100644
index 0000000..a7f3091
--- /dev/null
+++ b/pages/getinvolved/nav.php
@@ -0,0 +1,17 @@
+<?php
+
+$toc['menu'] = array (
+	'getinvolved' => R_('Get Involved'),
+	'getinvolved/documentation' => R_('Documentation'),
+	'getinvolved/translation' => R_('Translation'),
+	'getinvolved/development' => R_('Development'),
+	'getinvolved/promotion' => R_('Promotion'),
+	'getinvolved/testing' => R_('Testing'),
+	'getinvolved/bugreporting' => R_('Bug Reporting'));
+
+$toc['external'] = array (
+	'http://bugzilla.xfce.org' => R_('Report a bug'),
+	'http://translations.xfce.org' => R_('Translations'),
+	'http://buildbot.xfce.org' => R_('Buildbot'));
+
+?>
diff --git a/pages/development/translate.php b/pages/getinvolved/translation.php
similarity index 99%
rename from pages/development/translate.php
rename to pages/getinvolved/translation.php
index d86f0d6..c4db815 100644
--- a/pages/development/translate.php
+++ b/pages/getinvolved/translation.php
@@ -1,6 +1,6 @@
 <?php
 
-$head['title'] = R_('Translate');
+$head['title'] = R_('Translation');
 
 $toc['anchors'] = array (
         'started' => R_('Getting Started'),
diff --git a/pages/header.php b/pages/header.php
index 0127792..263f89f 100644
--- a/pages/header.php
+++ b/pages/header.php
@@ -56,8 +56,8 @@ else
 				<li><a href="/about"><?php E_('About') ?></a></li>
 				<li><a href="/download"><?php E_('Download') ?></a></li>
 				<li><a href="/community"><?php E_('Community') ?></a></li>
+				<li><a href="/getinvolved"><?php E_('Get Involved') ?></a></li>
 				<li><a href="/projects"><?php E_('Projects') ?></a></li>
-				<li><a href="/development"><?php E_('Development') ?></a></li>
 			</ul>
 		</div>
 		<form id="languageform" action="" method="get">
diff --git a/style/base.css b/style/base.css
index 57b0f3e..90deea0 100644
--- a/style/base.css
+++ b/style/base.css
@@ -84,6 +84,7 @@ body {
 	color: #999;
 	font-size: small;
 	margin-bottom: 5em;
+	margin-right: 205px;
 }
 
 #footer hr {



More information about the Xfce4-commits mailing list