Merge branch 'master' of git.freeside.biz:/home/git/www

[www.git] / index.html

diff --git a/index.html b/index.html
index 2cdafe5..cdfe14e 100644 (file)
--- a/index.html
+++ b/index.html
@@ -3,10 +3,12 @@
 <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.wispapalooza.net">WISPAPALOOZA</a>, Monday, Oct 13th, Las Vegas.  <a href="https://www.cvent.com/events/wispapalooza-2014/registration-8773af34cc4944efba5cfd664bcce724.aspx">Register now!</a><br>
 <font size="-1">Use coupon code FIS136 for a $50 discount!</font>
  </div>
+-->
 
 
 <div id="content_none">
@@ -17,7 +19,7 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
     <td width="450" align="center" valign="top" bgcolor="#BEBDBD" STYLE="padding:4px">
 
       <table>  
-<!--
+
         <tr>
           <td colspan=2 align="center">
            <h6>We're exhibiting!</h6>
@@ -28,25 +30,39 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
           <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>
+            <a href="http://www.fispalive.com/" target="_blank"><img src="FISPA.png" border=0 align="center" alt="FISPA"></a>
           </td>
 
           <td align=top>
-            <h4>We're exhibiting!</h4>
-            <h5>&nbsp;WISPAPalooza</h5>
-            <h4>Booth #136</h4>
-            <h4>Oct 14-16, 2014</h4>
-            <h4>Las Vegas, Nevada</h4>
+<!--            <h4>We're exhibiting!</h4> -->
+            <h5>&nbsp;FISPA Live</h5>
+            <h4>Feb 2-4, 2015</h4>
+            <h4>New Orleans, Louisiana</h4>
+&nbsp;&nbsp;<a href="mailto:sales@freeside.biz?subject=FISPA Live discount">Contact us</a> for a discount code<br><br>
           </td>
         </tr>
 
         <tr>
+          <td align="center">
+            <a href="http://www.cvent.com/events/wispamerica-2015/event-summary-5fddb419659f4b57871bfd2d0b690a85.aspx" target="_blank"><img src="wispamerica2014.png" border=0 align="center" alt="WISPAmerica"></a>
+          </td>
+
+          <td align=top>
+<!--            <h4>We're exhibiting!</h4> -->
+            <h5>&nbsp;WISPAmerica</h5>
+            <h4>Booth #110</h4>
+            <h4>Feb 23-26, 2015</h4>
+            <h4>St. Louis,  Missouri</h4>
+          </td>
+        </tr>
+<!--
+        <tr>
         <td colspan=2><h4>Use coupon code FIS136 for a $50 discount!</h4></td>
         </tr>
+-->
 
         <tr>
           <td colspan=2>
@@ -72,6 +88,18 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
         <tr> 
           <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>
           <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"><b>Dec&nbsp;9&nbsp;2014:</b></td>
+                <td width="*"><a href="/blog/2014/12/freeside-3-5-released/">3.5 released</a></td>
+              </tr>
+             <tr align="left" valign="top">
+                <td width="115" align="right" valign="top"><b>Oct&nbsp;23&nbsp;2014:</b></td>
+                <td width="*"><a href="/blog/2014/10/freeside-3-4-released/">3.4 released</a></td>
+              </tr>
+              <tr align="left" valign="top"> 
+                <td width="115" align="right" valign="top"><nobr><b>Oct&nbsp;14-16&nbsp;2014:</b></nobr></td>
+                <td width="*">Exhibited at <a href="http://www.cvent.com/events/wispapalooza-2014/event-summary-8773af34cc4944efba5cfd664bcce724.aspx">WISPAPalooza</a></td>
+              </tr>
 
               <tr align="left" valign="top"> 
                 <td width="115" align="right" valign="top"><nobr><b>Oct&nbsp;5-7&nbsp;2014:</b></nobr></td>
@@ -100,7 +128,7 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
 
               <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>
+                <td width="*">Exhibited at <a href="http://www.cvent.com/events/wispamerica-2014/archived-dc9ccd7053d04105a40aacc551fe59fd.aspx">WISP America</a></td>
               </tr>
 
               <tr align="left" valign="top"> 
@@ -118,15 +146,12 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
                 <td width="*">Exhibited at <a href="http://fispalive.com/nashville-2014/nashville-2014-schedule-at-a-glance/">FISPA Live</a></td>
               </tr>
 
+<!--
               <tr align="left" valign="top"> 
                 <td width="115" align="right" valign="top"><nobr><b>Jan&nbsp;29-31&nbsp;2014:</b></nobr></td>
                 <td width="*">Exhibited at <a href="http://www.tmcnet.com/voip/conference/digium-asterisk-world/">Asterisk World</a> / <a href="http://itexpo.tmcnet.com/east/">Internet Telephony Expo</a></td>
               </tr>
-
-              <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b><nobr>Oct&nbsp;14-18&nbsp;2013:</b></nobr></td>
-                <td width="*">Exhibited at <a href="http://www.cvent.com/events/wispapalooza-2013/event-summary-95ba2d6f4ba1492f8041f2306f4c7786.aspx">WISPAPALOOZA</a></td>
-              </tr>
+-->
 
             </table></td>
           <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>