incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robw...@apache.org
Subject svn commit: r1394036 - in /incubator/ooo/ooo-site/trunk/content/bizdev: ./ consultants/
Date Thu, 04 Oct 2012 13:00:01 GMT
Author: robweir
Date: Thu Oct  4 13:00:00 2012
New Revision: 1394036

URL: http://svn.apache.org/viewvc?rev=1394036&view=rev
Log:
Move the new consultants directory into the BizDev project where it was located in the legacy
OOo project.  This preserves the old links.

Also, moved the XSLT scripts and data here, instead of devtools.  This allows the user to
check out a single directory tree and make all of the needed changes.

Added:
    incubator/ooo/ooo-site/trunk/content/bizdev/consultant-submission.html
      - copied, changed from r1393531, incubator/ooo/ooo-site/trunk/content/support/test/consultant-submission.html
    incubator/ooo/ooo-site/trunk/content/bizdev/consultants/
    incubator/ooo/ooo-site/trunk/content/bizdev/consultants.html
      - copied unchanged from r1393531, incubator/ooo/ooo-site/trunk/content/support/test/consultants.html
    incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xml
    incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xsd
    incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_en.xml
    incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_it.xml
    incubator/ooo/ooo-site/trunk/content/bizdev/consultants/to-html.xsl
Removed:
    incubator/ooo/ooo-site/trunk/content/bizdev/todos.html

Copied: incubator/ooo/ooo-site/trunk/content/bizdev/consultant-submission.html (from r1393531,
incubator/ooo/ooo-site/trunk/content/support/test/consultant-submission.html)
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/bizdev/consultant-submission.html?p2=incubator/ooo/ooo-site/trunk/content/bizdev/consultant-submission.html&p1=incubator/ooo/ooo-site/trunk/content/support/test/consultant-submission.html&r1=1393531&r2=1394036&rev=1394036&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/support/test/consultant-submission.html (original)
+++ incubator/ooo/ooo-site/trunk/content/bizdev/consultant-submission.html Thu Oct  4 13:00:00
2012
@@ -9,13 +9,15 @@ If you would like to have your listing a
 
 <ol>
     <li>Listings must be submitted to the <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list">ooo-dev</a>
mailing list as patches 
-    to the <a href="https://svn.apache.org/repos/asf/incubator/ooo/devtools/consultants/consultants.xml">consultants.xml</a>
file.  If you are not familiar with XML, please 
+    to the <a href="https://svn.apache.org/repos/asf/incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xml">consultants.xml</a>
file.  If you are not familiar with XML, please 
         submit the equivalent information in a post to the ooo-dev list and we can help you
format it for submission.  But your listing will appear faster if it is submitted 
         in the proper form.</li>
-    <li>Listings must be valid per the <a href="https://svn.apache.org/repos/asf/incubator/ooo/devtools/consultants/consultants.xsd">consultants.xsd</a>
schema file.</li>
-    <li>Listings must be factual and relevant.</li>
+    <li>Listings must be valid per the <a href="https://svn.apache.org/repos/asf/incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xsd">consultants.xsd</a>
schema file.</li>
+    <li>Listings must be factual and specifically relevant to OpenOffice.  Generic
IT services companies without a specific offering on their website directly relevant to OpenOffice

+        would probably not be a good fit for these listings.  In other words, if your website
is not mentioning OpenOffice, why should our website mention you?</li>
     <li>The Description field is limited to 512 characters and must be plain text,
with no embedded markup or images</li>
-    <li>Listings and the websites and email addresses referenced must <a href="http://www.apache.org/foundation/marks/">respect
ASF trademarks</a>.
+    <li>Listings and the websites and email addresses referenced must <a href="http://www.apache.org/foundation/marks/">respect
ASF trademarks</a>.  Note: Our official name is now 
+        Apache OpenOffice&trade;</li>
     <li>Listings must not imply approval, endorsement or affiliation with the Apache
OpenOffice project or the ASF.</li>
     <li>Listings with invalid links, 404 errors, etc. may be removed.  Please keep
your listing up-to-date.</li>
     <li>All listings appear soley at the discretion of the Apache OpenOffice PMC. 
If you have any questions on the above, please ask on 
@@ -24,7 +26,7 @@ If you would like to have your listing a
 
 <h1>Technincal requirements for submissions</h1>
 
-<p>The XML Schema definition for submissions is <a href="https://svn.apache.org/repos/asf/incubator/ooo/devtools/consultants/consultants.xsd">here</a>.
 
+<p>The XML Schema definition for submissions is <a href="https://svn.apache.org/repos/asf/incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xsd">here</a>.
 
 Additionally, here are some details on the fields in that schema:</p>
 
 <ul>
@@ -42,7 +44,7 @@ Additionally, here are some details on t
             </ul>
         <li>"description" further describes the services you offer. Keep it brief and
factual.  This field is required and is limited to 400 characters.</li>
         <li>"website" is the URL for your website.  The "name" field is linked to this
URL.  If you have a page specifically covering your OpenOffice-related services, this
-            might be preferred over a generic page that is not as relevant to OpenOffice
users.  This element is required.</li>
+            is preferred over a generic page that is not as relevant to OpenOffice users.
 This element is required.</li>
         <li>"email" is an email address where users can get more information.  This
element is optional. If included it must be a valid email address.</li>
         <li>"phone" is an phone number where users can get more information.  This
element is optional.</li>
 </ul>

Added: incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xml?rev=1394036&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xml (added)
+++ incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xml Thu Oct  4 13:00:00
2012
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<consultants>
+    
+    <consultant>
+        <name>The Learning Machine, Ltd</name>
+        <country>Global</country>
+        <practice>Certification</practice>
+        <description>The Learning Machine, Ltd provides certification of IT
+            user skills in the context of Apache Open Office, accredited by the UK
+            national Regulators and referenced to the European Qualifications
+            Framework. We work through organisations such as schools, colleges and
+            adult education providers.</description>
+        <website>https://theingots.org/community/CertOOo</website>
+        <email>ian.lynch@theingots.org</email>
+        <phone>+44 (0) 1827305940</phone>
+    </consultant>
+    
+    <consultant>
+            <name>John Doe</name>
+        <country>PT</country>
+         <country>ES</country>
+       
+        <practice>Development</practice>
+        <description>At John Doe we do application developement for OpenOffice.  Give
us your requirements and we'll give you a quote.  
+            No job is too small.</description>
+            <website>http://www/jdoe.com/services.html</website>
+            <email>j@doe.com</email>
+            <phone>123-456-7890</phone>
+        </consultant>
+        <consultant>
+        <name>Joe Bloggs, LLC</name>
+             <country>DE</country>
+            <country>CH</country>
+            <country>AT</country>
+            <practice>Deployment</practice>
+           
+        <description>Joe Bloggs, LLC provides custom deployment and migration servives
for small and medium business moving to OpenOffice.  We work with the client from initial

+        evaluation and piloting, through deployment and beyond.  References and whitepaper
are available on our website.</description>
+        <website>http://www/jbloggsllc.com/openoffice.html</website>
+        <email>joe@jbloggsllc.com</email>
+        <phone>123-456-7890</phone>
+    </consultant>
+   
+</consultants>
\ No newline at end of file

Added: incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xsd
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xsd?rev=1394036&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xsd (added)
+++ incubator/ooo/ooo-site/trunk/content/bizdev/consultants/consultants.xsd Thu Oct  4 13:00:00
2012
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="consultants">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="consultant"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="consultant">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="name"/>
+        <xs:element maxOccurs="unbounded" ref="country"/>
+        <xs:element maxOccurs="unbounded" ref="practice"/>
+        <xs:element ref="description"/>
+        <xs:element ref="website"/>
+        <xs:element minOccurs="0" ref="email"/>
+        <xs:element minOccurs="0" ref="phone"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="name" type="xs:string"/>
+   <xs:element name="country" type="xs:string"/>
+  <xs:element name="practice" type="practice"/>
+  <xs:element name="description" type="description"/>
+  <xs:element name="website" type="xs:anyURI"/>
+  <xs:element name="email" type="email-address"/>
+  <xs:element name="phone" type="xs:string"/>
+  
+  
+   <xs:simpleType name="email-address">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[^@]+@[^\.]+\..+"/>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  <xs:simpleType name="description">
+    <xs:restriction base="xs:string">
+      <xs:minLength value="0"/>
+      <xs:maxLength value="400"/>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  <xs:simpleType name="practice">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Deployment"/>
+      <xs:enumeration value="Support"/>
+      <xs:enumeration value="Training"/>
+      <xs:enumeration value="Development"/>
+      <xs:enumeration value="Certification"/>
+      <xs:enumeration value="Other"/>
+    </xs:restriction>
+  </xs:simpleType>
+   
+</xs:schema>

Added: incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_en.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_en.xml?rev=1394036&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_en.xml (added)
+++ incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_en.xml Thu Oct  4 13:00:00
2012
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+    <string id="page-title">Apache OpenOffice Consultants</string>
+    
+    <string id="disclaimer-text">Although most individual users are able to install
and use Apache OpenOffice without any help, or with the assistance of volunteers on our community
support forum and mailing lists, 
+        some users, especially corporate users, may have more complex requirements that require
professional services in order to optimize their deployments.  The following 
+        individuals and firms offer services that may be of interest.   The information provided
here was provided by the entities named, and is not verified or endorsed by 
+        the Apache OpenOffice project.  We offer this listing as a service to the ecosystem.</string>
+    
+    <string id="submission-instructions">Consultants who wish to add their listing
here should refer to these instructions: </string>
+    
+    <string id="name-header">Name</string>
+    <string id="area-header">Area of Practice</string>
+    <string id="countries-header">Countries</string>
+    <string id="description-header">Description</string>
+    <string id="contact-header">Contact</string>
+    
+</strings>
\ No newline at end of file

Added: incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_it.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_it.xml?rev=1394036&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_it.xml (added)
+++ incubator/ooo/ooo-site/trunk/content/bizdev/consultants/strings_it.xml Thu Oct  4 13:00:00
2012
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+    <string id="page-title">Benvenuti consulenti su Apache OpenOffice</string>
+    
+    <string id="disclaimer-text">Benché molti utenti siano in grado di installare
e utilizzare Apache OpenOffice
+senza aiuto, o grazie all'assistenza dei volontari del nostro forum e mailing list, altri,
in particolare gli utenti aziendali,
+possono avere delle esigenze più complesse che richiedono servizi commerciali al fine
di ottimizzare le loro installazioni.
+I seguenti privati o aziende offrono servizi che possono essere utili. I dati sono
+forniti direttamente dagli interessati e senza controllo né appoggio da parte del progetto
Apache OpenOffice.
+Offriamo questo elenco come servizio alla comunità.</string>
+    
+    <string id="submission-instructions">I consulenti che vogliono essere elencati
qui devono fare riferimento a queste istruzioni: </string>
+    
+    <string id="name-header">Nome</string>
+    <string id="area-header">Settore/Applicazione</string>
+    <string id="countries-header">Paesi</string>
+    <string id="description-header">Descrizione</string>
+    <string id="contact-header">Contatti</string>
+    
+</strings>

Added: incubator/ooo/ooo-site/trunk/content/bizdev/consultants/to-html.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/bizdev/consultants/to-html.xsl?rev=1394036&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/bizdev/consultants/to-html.xsl (added)
+++ incubator/ooo/ooo-site/trunk/content/bizdev/consultants/to-html.xsl Thu Oct  4 13:00:00
2012
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+    
+    <xsl:output method="html"/>
+    
+    <!-- 
+        
+    Load the UI strings from the locale-appropriate resource file.  An input XSLT parameter
called 'locale' should contain the locale. 
+    
+    The resource files should be named strings_<locale>.xml and be in the same directory
as the XSLT script.
+    
+    -->
+    
+    <xsl:param name="locale" select="en"/>
+    
+    <xsl:variable name="fileName" select="concat('strings_', $locale, '.xml')"/>
+    <xsl:variable name="localizedStrings" select="document($fileName)/*"/>
+    
+    <xsl:variable name="disclaimer-text" select="$localizedStrings/string[@id='disclaimer-text']/text()"/>
+    <xsl:variable name="submission-instructions" select="$localizedStrings/string[@id='submission-instructions']/text()"/>
+    <xsl:variable name="page-title" select="$localizedStrings/string[@id='page-title']/text()"/>
+    <xsl:variable name="name-header" select="$localizedStrings/string[@id='name-header']/text()"/>
+    <xsl:variable name="area-header" select="$localizedStrings/string[@id='area-header']/text()"/>
+    <xsl:variable name="countries-header" select="$localizedStrings/string[@id='countries-header']/text()"/>
+    <xsl:variable name="description-header" select="$localizedStrings/string[@id='description-header']/text()"/>
+    <xsl:variable name="contact-header" select="$localizedStrings/string[@id='contact-header']/text()"/>
+    
+    
+<!-- Main template deals with the introductory text and the basic table declaration -->
+    <xsl:template match="/">
+        
+    <xsl:comment>NOTE:  This file is machine-generated.  Do not edit it directly or
else your changes will be overwritten the next time we generate the page.   
+    If you want to edit the underlying listing data then you need to edit the consultants/consultants.xml
file.  If you want to edit the structure of the page then you need
+    to edit the consultants/to-html.xsl file.  If you want to change or translate the text
in the page you want to edit consultants/strings_locale.xml.    
+   </xsl:comment>
+        <html>
+            <head>
+                <title><xsl:value-of select="$page-title"/></title>
+            </head>
+            <body>
+               
+                <h1><xsl:value-of select="$page-title"/></h1>
+                
+                <p><xsl:value-of select="$disclaimer-text"/></p>
+                
+                <p><xsl:value-of select="$submission-instructions"/><a href="consultant-submission.html">consultant-submission.html</a></p>
+                
+                <br/>
+               
+                <table border="1">
+                    <tr>
+                        <th><xsl:value-of select="$name-header"/></th>
+                        <th><xsl:value-of select="$area-header"/></th>
+                        <th><xsl:value-of select="$countries-header"/></th>
+                        <th width="50%"><xsl:value-of select="$description-header"/></th>
+                        <th><xsl:value-of select="$contact-header"/></th>
+                    </tr>
+                    <xsl:for-each select="consultants/consultant">
+                        <xsl:sort lang="$locale" select="name"/>
+                        <xsl:apply-templates select="."/>
+                    </xsl:for-each>
+                </table>
+            </body>
+        </html>
+    </xsl:template>
+    
+    
+    <!-- This template handles the per-consultant information, for each row of the table
-->
+    
+   <xsl:template match="consultant">
+       <tr>
+           <td>
+                <a rel="nofollow" href="{website}"><xsl:value-of select="name"/></a>
+          </td>
+           <td>
+               <xsl:for-each select="practice">  
+                   <xsl:sort lang="$locale" select="."/>
+                   <xsl:value-of select="."/>
+                   <br/>
+               </xsl:for-each>
+               
+           </td>
+           <td>
+               <xsl:for-each select="country">  
+                   <xsl:sort lang="$locale" select="."/>
+                   <xsl:value-of select="."/>
+                   <br/>
+               </xsl:for-each>
+               
+           </td>           
+           <td>
+               <xsl:value-of select="description"/>
+           </td>
+           <td>
+               <a href="{concat('mailto:',email)}"><xsl:value-of select="email"/></a>
+               <br/>
+               <xsl:value-of select="phone"/>
+           </td> 
+       </tr>
+       
+   </xsl:template> 
+ 
+</xsl:stylesheet>



Mime
View raw message