wispapalooza and comptel happened, ispsummit.ca upcoming

diff --git a/New-Summit-Logo-2015-e1426090762852.png b/New-Summit-Logo-2015-e1426090762852.png
new file mode 100644 (file)
index 0000000..2f2a44f
Binary files /dev/null and b/New-Summit-Logo-2015-e1426090762852.png differ

diff --git a/elements/header.html b/elements/header.html
index cb68f33..81e4eea 100644 (file)
--- a/elements/header.html
+++ b/elements/header.html
@@ -40,9 +40,11 @@
   </div>
 </div>
 
+<!--
  <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.wispa.org/Events/WISPAPALOOZA-2015">WISPAPalooza</a>, Monday, Oct 12th, Las Vegas.  <a href="https://secure.freeside.biz/selfservice/signup.cgi">Register now!</a><br>
  </div>
+-->
 
 <!-- resume after training if we still need help
 <div id="header_extra">

diff --git a/index.html b/index.html
index 966834f..78cb8fd 100644 (file)
--- a/index.html
+++ b/index.html
@@ -3,13 +3,6 @@
 <title>ISP Billing, VoIP 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/wispamerica-2015/event-summary-5fddb419659f4b57871bfd2d0b690a85.aspx">WISPAmerica</a>, Monday, Feb 23th, St. Louis.  <a href="https://www.cvent.com/events/wispamerica-2015/registration-5fddb419659f4b57871bfd2d0b690a85.aspx">Register now!</a><br>
-<small>(Attending the training only and not WISPAmerica?  <a href="contact.html" style="font-size:100%">Contact us</a> to register.)</small>
- </div>
--->
-
 <div id="content_none">
  
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -20,50 +13,23 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
       <table>  
 
         <tr>
-          <td colspan=2 align="center">
-           <h6>We're exhibiting!</h6>
-          </td>
-        </tr>
-
-        <tr>
-          <td colspan=2>
-          </td>
-        </tr>
-
-        <tr>
-          <td align="center">
-            <a href="http://www.wispa.org/Events/WISPAPALOOZA-2015" target="_blank"><img src="wispapalooza.png" border=0 align="center" alt="WISPAPalooza"></a>
-          </td>
-
-          <td align=top>
-<!--            <h4>We're exhibiting!</h4> -->
-            <h5>&nbsp;WISPAPalooza</h5>
-            <h4>Booth #416</h4>
-            <h4>Oct 12-15, 2015</h4>
-            <h4>Las Vegas, Nevada</h4>
-          </td>
-        </tr>
-
-        <tr>
           <td colspan=2>
           </td>
         </tr>
 
         <tr>
           <td align="center">
-            <a href="http://www.comptelplus.org/" target="_blank"><img src="Comptel-Plus-logo.jpg" border=0 align="center" alt="WISPAPalooza"></a>
+            <a href="http://www.ispsummit.ca" target="_blank"><img src="New-Summit-Logo-2015-e1426090762852.png" border=0 align="center" alt="Canadian ISP Summit"></a>
           </td>
 
           <td align=top>
-<!--            <h4>We're exhibiting!</h4> -->
-            <h5>&nbsp;Comptel Plus</h5>
-            <h4>Booth #802</h4>
-            <h4>Oct 18-20, 2015</h4>
-            <h4>San Francisco, California</h4>
+            <h4>We're exhibiting!</h4>
+            <h6>&nbsp;Canadian&nbsp;ISP&nbsp;Summit</h6>
+            <h4>Nov 9-11, 2015</h4>
+            <h4>Toronto, Ontario</h4>
           </td>
         </tr>
 
-
       </table>
 
       <table width="420" height="*" border="0" cellpadding="0" cellspacing="0">
@@ -85,6 +51,16 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
           <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>Oct&nbsp;18-20&nbsp;2015:</b></nobr></td>
+                <td width="*">Exhibited at <a href="http://www.comptelplus.org/">Comptel Plus</a></td>
+              </tr>
+
+              <tr align="left" valign="top"> 
+                <td width="115" align="right" valign="top"><nobr><b>Oct&nbsp;12-15&nbsp;2015:</b></nobr></td>
+                <td width="*">Training and exhibited at <a href="http://www.wispa.org/Events/WISPAPALOOZA-2015">WISPAPalooza</a></td>
+              </tr>
+
+              <tr align="left" valign="top"> 
                 <td width="115" align="right" valign="top"><nobr><b>Jul&nbsp;28-29&nbsp;2015:</b></nobr></td>
                 <td width="*">Exhibited at <a href="http://www.hostingcon.com/global">HostingCon</a></td>
               </tr>
@@ -102,7 +78,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>Feb&nbsp;23-26&nbsp;2015:</b></nobr></td>
-                <td width="*">Exhibited at <a href="http://www.cvent.com/events/wispamerica-2015/event-summary-5fddb419659f4b57871bfd2d0b690a85.aspx">WISPAmerica</a></td>
+                <td width="*">Training and exhibited at <a href="http://www.cvent.com/events/wispamerica-2015/event-summary-5fddb419659f4b57871bfd2d0b690a85.aspx">WISPAmerica</a></td>
               </tr>
 
              <tr align="left" valign="top">
@@ -123,15 +99,6 @@ Full day <a href="http://www.freeside.biz/mediawiki/index.php/1_Day_Wisp_Trainin
                 <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>
-                <td width="*">Exhibited at <a href="http://www.comptelplus.org">CompTel Plus</a></td>
-              </tr>
 
              <tr align="left" valign="top">
                 <td width="115" align="right" valign="top"><b>Sep&nbsp;7&nbsp;2014:</b></td>