incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robw...@apache.org
Subject svn commit: r1393079 - in /incubator/ooo/devtools/consultants: consultants.xml consultants.xsd to-html.xsl
Date Tue, 02 Oct 2012 18:21:06 GMT
Author: robweir
Date: Tue Oct  2 18:21:06 2012
New Revision: 1393079

URL: http://svn.apache.org/viewvc?rev=1393079&view=rev
Log:
Various updates:  added Ian's info to consultants.xml, enhanced the to-html.xsl transforms
to include locale-aware sorting, further work on the consultants.xsd schema.

Modified:
    incubator/ooo/devtools/consultants/consultants.xml
    incubator/ooo/devtools/consultants/consultants.xsd
    incubator/ooo/devtools/consultants/to-html.xsl

Modified: incubator/ooo/devtools/consultants/consultants.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/consultants/consultants.xml?rev=1393079&r1=1393078&r2=1393079&view=diff
==============================================================================
--- incubator/ooo/devtools/consultants/consultants.xml (original)
+++ incubator/ooo/devtools/consultants/consultants.xml Tue Oct  2 18:21:06 2012
@@ -1,10 +1,25 @@
 <?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>
-            <logo>jdoe.jpg</logo>
-        <country>ES</country>
         <country>PT</country>
+         <country>ES</country>
+       
         <practice>Extensions</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>
@@ -14,18 +29,19 @@
         </consultant>
         <consultant>
         <name>Joe Bloggs, LLC</name>
-        <logo>jbloggs.jpg</logo>
-            <country>DE</country>
+             <country>DE</country>
             <country>CH</country>
             <country>AT</country>
-            <practice>Deployment</practice>
             <practice>Migration</practice>
+            <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

Modified: incubator/ooo/devtools/consultants/consultants.xsd
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/consultants/consultants.xsd?rev=1393079&r1=1393078&r2=1393079&view=diff
==============================================================================
--- incubator/ooo/devtools/consultants/consultants.xsd (original)
+++ incubator/ooo/devtools/consultants/consultants.xsd Tue Oct  2 18:21:06 2012
@@ -40,7 +40,7 @@
   <xs:simpleType name="description">
     <xs:restriction base="xs:string">
       <xs:minLength value="0"/>
-      <xs:maxLength value="300"/>
+      <xs:maxLength value="400"/>
     </xs:restriction>
   </xs:simpleType>
   
@@ -51,6 +51,7 @@
       <xs:enumeration value="Extensions"/>
       <xs:enumeration value="Training"/>
       <xs:enumeration value="Customization"/>
+      <xs:enumeration value="Certification"/>
       <xs:enumeration value="Other"/>
     </xs:restriction>
   </xs:simpleType>

Modified: incubator/ooo/devtools/consultants/to-html.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/consultants/to-html.xsl?rev=1393079&r1=1393078&r2=1393079&view=diff
==============================================================================
--- incubator/ooo/devtools/consultants/to-html.xsl (original)
+++ incubator/ooo/devtools/consultants/to-html.xsl Tue Oct  2 18:21:06 2012
@@ -51,7 +51,7 @@
                         <th><xsl:value-of select="$contact-header"/></th>
                     </tr>
                     <xsl:for-each select="consultants/consultant">
-                        <xsl:sort select="name"/>
+                        <xsl:sort lang="$locale" select="name"/>
                         <xsl:apply-templates select="."/>
                     </xsl:for-each>
                 </table>
@@ -69,6 +69,7 @@
           </td>
            <td>
                <xsl:for-each select="practice">  
+                   <xsl:sort lang="$locale" select="."/>
                    <xsl:value-of select="."/>
                    <br/>
                </xsl:for-each>
@@ -76,6 +77,7 @@
            </td>
            <td>
                <xsl:for-each select="country">  
+                   <xsl:sort lang="$locale" select="."/>
                    <xsl:value-of select="."/>
                    <br/>
                </xsl:for-each>
@@ -85,7 +87,7 @@
                <xsl:value-of select="description"/>
            </td>
            <td>
-               <xsl:value-of select="email"/>
+               <a href="{concat('mailto:',email)}"><xsl:value-of select="email"/></a>
                <br/>
                <xsl:value-of select="phone"/>
            </td> 



Mime
View raw message