oscon

[www.git] / index.html

diff --git a/index.html b/index.html
index 41c47a1..c4eac35 100644 (file)
--- a/index.html
+++ b/index.html
@@ -3,6 +3,11 @@
 <title>Billing, CRM, trouble ticketing and network monitoring - Freeside</title>
 { include('elements/header.html'); }
 
+ <div id="header_extra">
+Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Training">training class</a> at <a href="http://www.cvent.com/events/wispapalooza-2014/event-summary-8773af34cc4944efba5cfd664bcce724.aspx">WISPAPALOOZA</a>, Monday, Oct 13th, Las Vegas.  <a href="https://www.cvent.com/events/wispapalooza-2014/registration-8773af34cc4944efba5cfd664bcce724.aspx">Register now!</a>
+ </div>
+
+
 <div id="content_none">
  
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -20,7 +25,28 @@
 
         <tr>
           <td align="center">
-            <a href="http://www.wispamerica.net/" target="_blank"><img src="wispapalooza.png" border=0 align="center" alt="WISP America"></a>
+<a href="http://oscon.com/oscon14?cmp=ba-prog-confreg-home-os14_exhibitor_banner_125_125">
+<img src="http://cdn.oreillystatic.com/en/assets/1/event/115/oscon2014_exhibiting_125x125.gif" width="125" height="125"  border="0"  alt="OSCON 2014"  />
+</a>
+          </td>
+
+          <td align=top>
+<!--            <h4>We're exhibiting!</h4> -->
+            <h5>&nbsp;OSCon</h5>
+            <h4>Bluehost booth</h4>
+            <h4>Jul 21-23, 2014</h4>
+            <h4>Portland, Oregon</h4>
+          </td>
+        </tr>
+
+        <tr>
+          <td colspan=2>
+          </td>
+        </tr>
+
+        <tr>
+          <td align="center">
+            <a href="http://www.wispapalooza.net/" target="_blank"><img src="wispapalooza.png" border=0 align="center" alt="WISPAPalooza"></a>
           </td>
 
           <td align=top>
@@ -31,11 +57,13 @@
             <h4>Las Vegas, Nevada</h4>
           </td>
         </tr>
+
         <tr>
           <td colspan=2>
           </td>
         </tr>
 
+
       </table>
 
       <table width="420" height="*" border="0" cellpadding="0" cellspacing="0">
@@ -57,6 +85,21 @@
           <td height="*" align="center" valign="top" bgcolor="#A5A3A3"><table width="100%" border="0" cellpadding="2" cellspacing="5">
 
               <tr align="left" valign="top"> 
+                <td width="115" align="right" valign="top"><nobr><b>Jun&nbsp;16-18&nbsp;2014:</b></nobr></td>
+                <td width="*">Exhibited at <a href="http://www.fispalive.com/">FISPA Live</a></td>
+              </tr>
+
+             <tr align="left" valign="top">
+                <td width="115" align="right" valign="top"><b>May&nbsp;28&nbsp;2014:</b></td>
+                <td width="*"><a href="/blog/2014/05/freeside-3-3-released/">3.3 released</a></td>
+              </tr>
+
+             <tr align="left" valign="top">
+                <td width="115" align="right" valign="top"><b>Apr&nbsp;2&nbsp;2014:</b></td>
+                <td width="*"><a href="/blog/2014/04/freeside-2-3-9-released/">2.3.9 released</a></td>
+              </tr>
+
+              <tr align="left" valign="top"> 
                 <td width="115" align="right" valign="top"><nobr><b>Mar&nbsp;25-27&nbsp;2014:</b></nobr></td>
                 <td width="*">Exhibited at <a href="http://www.wispamerica.net/">WISP America</a></td>
               </tr>
@@ -87,25 +130,10 @@
               </tr>
 
               <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>Sep&nbsp;26&nbsp;2013:</b></td>
-                <td width="*"><a href="/blog/2013/09/freeside-2.3.8-released">2.3.8 released</a></td>
-              </tr>
-
-              <tr align="left" valign="top"> 
                 <td width="115" align="right" valign="top"><b><nobr>Aug&nbsp;28-29&nbsp;2013:</b></nobr></td>
                 <td width="*">Exhibited at <a href="http://itexpo.tmcnet.com/">Internet Telephony Expo</a>, awarded Best of Show!</td>
               </tr>
 
-              <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>Jul&nbsp;24&nbsp;2013:</b></td>
-                <td width="*"><a href="/blog/2013/07/freeside-3.1-released">3.1 released</a></td>
-              </tr>
-
-              <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>Jul&nbsp;2&nbsp;2013:</b></td>
-                <td width="*"><a href="/blog/2013/07/freeside-2.3.7-released">2.3.7 released</a></td>
-              </tr>
-
             </table></td>
           <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>
         </tr>