From: Alex Sadleir <maxious@lambdacomplex.org>
Date: Tue, 31 Dec 2013 15:35:03 +0000
Subject: fix import of bulleted lists
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=dcaas.git&a=commitdiff&h=1ad57b3b966827ac848a9765499f030df93dc684
---
fix import of bulleted lists
---


--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -44,9 +44,9 @@
     <ignored path="dcaas.iws" />
     <ignored path=".idea/workspace.xml" />
     <file path="/Dummy.txt" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388344993673" ignored="false" />
-    <file path="/import.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388236506137" ignored="false" />
-    <file path="/index.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388339437257" ignored="false" />
-    <file path="/config.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388498839775" ignored="false" />
+    <file path="/import.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388503606284" ignored="false" />
+    <file path="/index.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388501178314" ignored="false" />
+    <file path="/config.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388500928639" ignored="false" />
     <file path="/tagcloud.css" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388307524935" ignored="false" />
     <file path="/data.json.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388499467699" ignored="false" />
     <file path="/table.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388499014164" ignored="false" />
@@ -54,6 +54,7 @@
     <file path="/robots.txt" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388492384234" ignored="false" />
     <file path="/sitemap.xml.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388492660527" ignored="false" />
     <file path="/xls2csv.py" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388492814098" ignored="false" />
+    <file path="/about.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388503917255" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -117,7 +118,16 @@
       <file leaf-file-name="config.php" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/config.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="52" column="42" selection-start="1618" selection-end="1618" vertical-scroll-proportion="-13.615385">
+            <state line="91" column="48" selection-start="3457" selection-end="3481" vertical-scroll-proportion="-12.423077">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="about.php" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/about.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="10" column="16" selection-start="302" selection-end="302" vertical-scroll-proportion="0.3153989">
               <folding />
             </state>
           </provider>
@@ -153,10 +163,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="data.json.php" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="data.json.php" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data.json.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="45" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.45535713">
+            <state line="2" column="55" selection-start="70" selection-end="70" vertical-scroll-proportion="-1.3076923">
               <folding />
             </state>
           </provider>
@@ -166,15 +176,6 @@
         <entry file="file://$PROJECT_DIR$/lib/tag-cloud/css/tagcloud.css">
           <provider selected="true" editor-type-id="text-editor">
             <state line="44" column="17" selection-start="642" selection-end="642" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="table.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/table.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="24" column="58" selection-start="610" selection-end="610" vertical-scroll-proportion="-7.8461537">
               <folding />
             </state>
           </provider>
@@ -225,17 +226,17 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/data/import.php" />
         <option value="$PROJECT_DIR$/lib/tag-cloud/css/tagcloud.css" />
-        <option value="$PROJECT_DIR$/about.php" />
-        <option value="$PROJECT_DIR$/index.php" />
         <option value="$PROJECT_DIR$/robots.txt" />
         <option value="$PROJECT_DIR$/sitemap.xml.php" />
         <option value="$PROJECT_DIR$/data/xls2csv.py" />
         <option value="$PROJECT_DIR$/view.php" />
-        <option value="$PROJECT_DIR$/config.php" />
         <option value="$PROJECT_DIR$/table.php" />
         <option value="$PROJECT_DIR$/data.json.php" />
+        <option value="$PROJECT_DIR$/config.php" />
+        <option value="$PROJECT_DIR$/index.php" />
+        <option value="$PROJECT_DIR$/data/import.php" />
+        <option value="$PROJECT_DIR$/about.php" />
       </list>
     </option>
   </component>
@@ -301,152 +302,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tag-cloud" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tag-cloud" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tests" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lotsofcode" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="TagCloud" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tag-cloud" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lotsofcode" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="TagCloud" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tag-cloud" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="css" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dynatable" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="img" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dcaas" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
               <option name="myItemId" value="data" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -559,7 +414,7 @@
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25826973" sideWeight="0.67105263" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3384224" sideWeight="0.67105263" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -646,9 +501,7 @@
     <entry file="file://$PROJECT_DIR$/index.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="2" column="0" selection-start="30" selection-end="30" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -659,23 +512,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/about.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="13" selection-start="159" selection-end="159" vertical-scroll-proportion="0.1383721">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/robots.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state line="5" column="51" selection-start="175" selection-end="175" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data/import.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="41" column="27" selection-start="1839" selection-end="1839" vertical-scroll-proportion="-16.384615">
           <folding />
         </state>
       </provider>
@@ -690,67 +529,79 @@
         <state />
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/sitemap.xml.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="20" column="17" selection-start="876" selection-end="876" vertical-scroll-proportion="-13.076923">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/bootstrap.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/tag-cloud/css/tagcloud.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="44" column="17" selection-start="642" selection-end="642" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="24" column="58" selection-start="610" selection-end="610" vertical-scroll-proportion="-7.8461537">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data.json.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="2" column="55" selection-start="70" selection-end="70" vertical-scroll-proportion="-1.3076923">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/view.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="36" column="60" selection-start="1888" selection-end="1888" vertical-scroll-proportion="-23.538462">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/dynatable/jquery.dynatable.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="2" column="16" selection-start="0" selection-end="83" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data/import.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="58" column="18" selection-start="2200" selection-end="2200" vertical-scroll-proportion="1.8200371">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="91" column="48" selection-start="3457" selection-end="3481" vertical-scroll-proportion="-12.423077">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="25" column="53" selection-start="878" selection-end="878" vertical-scroll-proportion="-11.076923">
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sitemap.xml.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="17" selection-start="876" selection-end="876" vertical-scroll-proportion="-13.076923">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/view.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="36" column="60" selection-start="1888" selection-end="1888" vertical-scroll-proportion="-23.538462">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/css/bootstrap.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/dynatable/jquery.dynatable.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="2" column="16" selection-start="0" selection-end="83" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/tag-cloud/css/tagcloud.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="44" column="17" selection-start="642" selection-end="642" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="52" column="42" selection-start="1618" selection-end="1618" vertical-scroll-proportion="-13.615385">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/table.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="58" selection-start="610" selection-end="610" vertical-scroll-proportion="-7.8461537">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data.json.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="45" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.45535713">
+        <state line="0" column="0" selection-start="0" selection-end="163" vertical-scroll-proportion="-0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/about.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="16" selection-start="302" selection-end="302" vertical-scroll-proportion="0.3153989">
           <folding />
         </state>
       </provider>

--- a/about.php
+++ b/about.php
@@ -1,3 +1,11 @@
+<?php
+include("config.php");
+
+includeHeader("Data Centre as a Service (DCaaS)");
+?>
+<h1>About</h1>
 Icon "Cloud Computing" designed by <a href="http://thenounproject.com/andrewforrester/">Andrew Forrester</a> from the <a
     href="http://www.thenounproject.com/">Noun Project</a>
-
+<?php
+
+includeFooter();

--- a/config.php
+++ b/config.php
@@ -84,13 +84,14 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="#">Project name</a>
+                <a class="navbar-brand" href="/">Data Centre as a Service (DCaaS)</a>
             </div>
             <div class="collapse navbar-collapse">
                 <ul class="nav navbar-nav">
-                    <li class="active"><a href="#">Home</a></li>
-                    <li><a href="#about">About</a></li>
-                    <li><a href="#contact">Contact</a></li>
+                    <li class="active"><a href="/">Home</a></li>
+                    <li><a href="catalogue.php">Browse Service Catalogue</a></li>
+                    <li><a href="about.php">About</a></li>
+
                 </ul>
             </div>
             <!--/.nav-collapse -->

--- a/data/DCaaS+Catalogue+September+2013 PublicDCaaS_AFI_Part_3_Sec_5_Service_.csv
+++ b/data/DCaaS+Catalogue+September+2013 PublicDCaaS_AFI_Part_3_Sec_5_Service_.csv
@@ -9,7 +9,7 @@
 4D - Digital (Digest) Data Design,67060937171,ICT Services Continuity,"Your critical systems can be duplicated at 4D's premises for recovery in the event of a disaster.In the event of a disaster at your facility, your staff will be able to continue work from anywhere that they have an internet connection, by remotely connecting to their services and applications within the 4D datacentre. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Disaster Recovery,,24 X 7 X 365,,0.999,&gt; 2 Hours,Protected,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,&gt; 1 Month,&gt; 1 Month,"A virtual server with 1 CPU core, 2GBytes RAM running on Windows 2008 R2 plus a Microsoft SQL Server instance with 100 GByte of storage.",Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,,
 4D - Digital (Digest) Data Design,67060937171,Online Backups,"Automated remote backup service that backs up your important business data to 4D's secure datacentre. Data is backed up at the block level. Any backed up file can be restored upon request or by the client.A once-off setup sees 4D taking a snapshot of your data and placing it in our datacentre. Nightly backups then send only the changes to your data (ie. the ""Delta"") securely across the internet to 4D. Backups are encrypted and compressed. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Backup Services,,24 X 7 X 365,,0.999,&gt; 2 Hours,Protected,Supplier or Customer Admin,Supplier Only,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,&gt; 1 week,&gt; 60 mins,1GB of compressed backed-up data,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,,
 4D - Digital (Digest) Data Design,67060937171,Physical Server,"Dell PowerEdge T610 with single processor, 16GB RAM, 4 x 500GB HDD, Windows Server 2008 R2.Includes technical support for physical server and operating system.Note that different configurations are available if required. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Physical Server,,24 X 7 X 365,,0.999,&gt; 2 Hours,Protected,Supplier Only,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,&gt; 1 Month,&gt; 1 week,Per server,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,,
-4D - Digital (Digest) Data Design,67060937171,Test and Development Environment,Provision of virtual environment hosting user test and development environments allowing clients 24x7 access. Environment consists of a Microsoft Windows Server 2008 R2 virtual server hosting Microsoft Studio and allowing clients to install their test and development applications as required. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.,IaaS,Dev Test,,24 X 7 X 365,,0.999,&gt; 2 Hours,Protected,Supplier or Customer Admin,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,&gt; 60 min,&gt; 60 mins,Test and development environment for up to seven users. ,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,,
+4D - Digital (Digest) Data Design,67060937171,Test and Development Environment,Provision of virtual environment hosting user test and development environments allowing clients 24x7 access. Environment consists of a Microsoft Windows Server 2008 R2 virtual server hosting Microsoft Studio and allowing clients to install their test and development applications as required. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.,IaaS,Dev Test,,24 X 7 X 365,,0.999,&gt; 2 Hours,Protected,Supplier or Customer Admin,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,&gt; 60 min,&gt; 60 mins,Test and development environment for up to seven users.,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,,
 4D - Digital (Digest) Data Design,67060937171,Unified Communications,"Based on Microsoft Lync server. Comprises:Instant messaging and presence, conferencing, enterprise voice, office integration and mobile applications. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Instant Messaging,,24 X 7 X 365,,0.999,&gt; 2 Hours,Protected,Supplier or Customer Admin,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,&gt; 1 week,&gt; 1 week,Virtual unified communications server and ten users.,Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,,
 4D - Digital (Digest) Data Design,67060937171,Virtual Server,"4D offers a complete Virtual Server solution to clients, allowing them 24x7 access to their business applications from anywhere in the world that they have an internet connection.Each virtual server will be based on Microsoft Windows Server 2008 R2.This virtual server can be configured, and applications installed, as required; 4D can assist in this setup and installation if required. Where Microsoft software is required agencies prescribed to the Microsoft Volume Sourcing Agreement are required to supply the required software licenses.",IaaS,Virtual Server,,24 X 7 X 365,,0.999,&gt; 2 Hours,Protected,Supplier or Customer Admin,Supplier and Agency,24 X 7 X 365,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Off,Off,Off,Yes,Off,Yes,&gt; 60 min,&gt; 60 mins,"Virtual Server: includes 1 CPU core, 2GB RAM, and 100GB storage running on Windows 2008 R2. Additional storage can be purchased per the data storage service.",Australia,ACT,Marginally above 1.0 (4D uses free air cooling in its datacentre),Self assessed - Tier 2+. Willing to be certified by Uptime Institute if required.,,,,,,,,,,,,,,,,
 AAPT Pty Ltd,22052082416,virtual Data Centre / vInfrastructure - Backup Services,"AAPT's virtual Data Centre delivers a suite of secure, high availability cloud computing environments, comprising AAPT owned and operated servers, storage and networking equipment, hosted across geographically diverse managed data centres. AAPT's virtual Data Centre services are directly accessible over AAPT's high speed carrier-grade private network, or the public Internet.AAPT's vInfrastructure product provides a highly scalable environment comprising of fully customer configurable Cloud Computing resources, CPU, RAM along with Storage and a range of Backup options all managed through VMWare's vCloud Director management tool.AAPT operate dual CO and Data Centre capabilities within the same facility to maximise the customers access to all network services.",IaaS,Backup Services,,24 X 7 X 365,,0.9999,&gt; 2 Hours,NA,Supplier or Customer Admin,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Yes,Yes,Off,Yes,Yes,Yes,Off,Off,Yes,Off,Yes,Yes,Yes,Yes,Off,&gt; 60 min,&gt; 60 mins,"Resource Unit:1GB RAM, 1GHz CPU, 50GB Storage, 50GB Backup Storage",Australia,NSW,&gt;2,2.0,Australia,NSW,&gt;2,2.0,Australia,VIC,&gt;2,2.0,,,,,,,,
@@ -45,7 +45,7 @@
 Bulletproof Networks Pty Ltd,84094558808,Managed Enterprise Silver,"Dedicated Virtual Machine Hosting<br/>CPU: Dual Core<br/>RAM: 6GB<br/>HDD: 80GB Fibre Channel<br/>10GB Inbound Data, Unmetered Outbound",Managed Service,Virtual Server,,24 X 7 X 365,,0.9999,&gt; 2 Hours,NA,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Off,Yes,Yes,&gt; 1 week,&gt; 1 Month,Managed Enterprise Silver Dedicated VM Server,Australia,New South Wales,1.8,3+,,,,,,,,,,,,,,,,
 Bulletproof Networks Pty Ltd,84094558808,Managed Gold,"Dedicated Virtual Machine Hosting<br/>CPU: Dual Core<br/>RAM: 6GB<br/>HDD: 100GB Fibre Channel<br/>15GB Inbound Data, Unmetered Outbound",Managed Service,Virtual Server,,24 X 7 X 365,,0.9999,&gt; 2 Hours,NA,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Off,Yes,Yes,&gt; 1 week,&gt; 1 Month,Managed Gold Dedicated VM Server,Australia,New South Wales,1.8,3+,,,,,,,,,,,,,,,,
 Bulletproof Networks Pty Ltd,84094558808,Managed Silver,"Dedicated Virtual Machine Hosting<br/>CPU: Dual Core<br/>RAM: 4GB<br/>HDD: 80GB Fibre Channel<br/>10GB Inbound Data, Unmetered Outbound",Managed Service,Virtual Server,,24 X 7 X 365,,0.9999,&gt; 2 Hours,NA,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Off,Yes,Off,Yes,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Off,Yes,Yes,&gt; 1 week,&gt; 1 Month,Managed Silver Dedicated VM Server,Australia,New South Wales,1.8,3+,,,,,,,,,,,,,,,,
-C3 Business Solutions Pty Ltd,35122885465,C3 Insight,"C3 Insight is a complete, affordable data acquisition and reporting solution that is quick and easy to install and use. C3 Insight immediately addresses data governance challenges with a robust business rule engine that you can tailor to your specific requirements upfront. C3 Insight enables you to unlock the power of your data instantly with no downtime and no deep technical skills required. File load formats are completely flexible and include an MSExcel add-in. Already in use across both State and Federal government agencies, C3 Insight is fast and easy to set up and run, it will reduce the cost of data acquisition and reporting and will deliver immediate ROI and trusted information for your business.<br/><br/>Data governance, acquisition & validation continues to challenge government at all levels, particularly when the data is coming from other departments or outside agencies and sources. Getting the data together and getting it accurate and collated when you need it absorbs considerable budget, time and resources. And, even when the investment is made, there are often questions around data quality due to poor or non-existent governance processes. All that time and effort and still, no one trusts the data. <br/><br/>Streamlining and automating these processes is key to maximising efficiency and turning the swathes of government data currently sitting in individual agencies, departments and divisions into collated, useful, timely information for more informed decision making. <br/><br/>Already in use across both State and Federal government agencies, C3 Insight is fast and easy to set up and run, it will reduce the cost of data acquisition and reporting and will deliver immediate ROI and trusted information for your business.<br/><br/>See your business / organisation at a glance. Combine all the data you need, from multiple data sources, into personalised real-time dashboards. C3 Insights interactive dashboards let you filter, drill to detail, and analyse right in a browser. With C3 Insight, you can go from data to dashboards in just hours; not days, weeks or months.<br/><br/>Imagine connecting the data, people, and creativity of your organisation to help everyone make better business decisions. With C3 Insight you can. We do this by facilitating discussions and making your BI content incredibly easy to share. Embed your intelligence into wikis and company intranet for everyone to use and access.<br/><br/>You will love C3 Insights mobile app. It combines outstanding collaborative features with great usability - simply swipe to browse dashboards and reports, filter with a tap of a finger, or pinch and zoom. Our approach means that as soon as you create a report or dashboard, it's enabled on your favourite mobile device - no extra steps or development.<br/><br/>Real-time alerts let you know the moment something critical happens in your business. With C3 Insight it's so easy to create alerts that monitor your business data for you. Reports emailed, or alerts pushed, to your phone or iPad let you take immediate action.<br/><br/>Data visualisation is not only a great way to present your data, but a powerful way to explore your data as well. C3 Insight lets you pick and change visualisations effortlessly so you can spot outliers and trends with ease. With 44 chart types - from sophisticated trellis charts, to popular line and metre charts - the right visualisation is just a click away.<br/><br/>Data visualisation is not only a great way to present your data, but a powerful way to explore your data as well. C3 Insight lets you pick and change visualisations effortlessly so you can spot outliers and trends with ease. With 44 chart types - from sophisticated trellis charts, to popular line and metre charts - the right visualisation is just a click away.<br/><br/>Data analysis requires more than just basic filtering - you need to be able to explore your data. C3 Insights highly intuitive report builder lets you analyse your data in ways you didnt think possible. Drill Down, Drill Through or Drill Anywhere - even across multiple data sources. We dont put barriers between you and your data exploration.<br/><br/>C3 Insight is different. Unlike most BI products, we deliver all the BI functionality you need via a single-integrated platform. C3 Insight can be installed in an hour, and deployed to 1000s of users in seconds. From meta-data to dashboards, user security and scheduling, youll only ever interact with the one application. C3 Insight significantly reduces your training, deployment and administration costs.<br/>", ,Business Intelligence,,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier or Customer Admin,Agency Only,24 X 7 Bus Ex Hols,Yes,Off,Yes,,Yes,,Yes,,Yes,Off,Yes,Yes,,Yes,Off,,Yes,,Yes,Yes,&gt; 1 week,&gt; 1 week,Per instance,Australia,NSW,1.85,3.0,Australia,NSW,1.85,2.0,,,,,,,,,,,,
+C3 Business Solutions Pty Ltd,35122885465,C3 Insight,"C3 Insight is a complete, affordable data acquisition and reporting solution that is quick and easy to install and use. C3 Insight immediately addresses data governance challenges with a robust business rule engine that you can tailor to your specific requirements upfront. C3 Insight enables you to unlock the power of your data instantly with no downtime and no deep technical skills required. File load formats are completely flexible and include an MSExcel add-in. Already in use across both State and Federal government agencies, C3 Insight is fast and easy to set up and run, it will reduce the cost of data acquisition and reporting and will deliver immediate ROI and trusted information for your business.<br/><br/>Data governance, acquisition & validation continues to challenge government at all levels, particularly when the data is coming from other departments or outside agencies and sources. Getting the data together and getting it accurate and collated when you need it absorbs considerable budget, time and resources. And, even when the investment is made, there are often questions around data quality due to poor or non-existent governance processes. All that time and effort and still, no one trusts the data. <br/><br/>Streamlining and automating these processes is key to maximising efficiency and turning the swathes of government data currently sitting in individual agencies, departments and divisions into collated, useful, timely information for more informed decision making. <br/><br/>Already in use across both State and Federal government agencies, C3 Insight is fast and easy to set up and run, it will reduce the cost of data acquisition and reporting and will deliver immediate ROI and trusted information for your business.<br/><br/>See your business / organisation at a glance. Combine all the data you need, from multiple data sources, into personalised real-time dashboards. C3 Insights interactive dashboards let you filter, drill to detail, and analyse right in a browser. With C3 Insight, you can go from data to dashboards in just hours; not days, weeks or months.<br/><br/>Imagine connecting the data, people, and creativity of your organisation to help everyone make better business decisions. With C3 Insight you can. We do this by facilitating discussions and making your BI content incredibly easy to share. Embed your intelligence into wikis and company intranet for everyone to use and access.<br/><br/>You will love C3 Insights mobile app. It combines outstanding collaborative features with great usability - simply swipe to browse dashboards and reports, filter with a tap of a finger, or pinch and zoom. Our approach means that as soon as you create a report or dashboard, it's enabled on your favourite mobile device - no extra steps or development.<br/><br/>Real-time alerts let you know the moment something critical happens in your business. With C3 Insight it's so easy to create alerts that monitor your business data for you. Reports emailed, or alerts pushed, to your phone or iPad let you take immediate action.<br/><br/>Data visualisation is not only a great way to present your data, but a powerful way to explore your data as well. C3 Insight lets you pick and change visualisations effortlessly so you can spot outliers and trends with ease. With 44 chart types - from sophisticated trellis charts, to popular line and metre charts - the right visualisation is just a click away.<br/><br/>Data visualisation is not only a great way to present your data, but a powerful way to explore your data as well. C3 Insight lets you pick and change visualisations effortlessly so you can spot outliers and trends with ease. With 44 chart types - from sophisticated trellis charts, to popular line and metre charts - the right visualisation is just a click away.<br/><br/>Data analysis requires more than just basic filtering - you need to be able to explore your data. C3 Insights highly intuitive report builder lets you analyse your data in ways you didnt think possible. Drill Down, Drill Through or Drill Anywhere - even across multiple data sources. We dont put barriers between you and your data exploration.<br/><br/>C3 Insight is different. Unlike most BI products, we deliver all the BI functionality you need via a single-integrated platform. C3 Insight can be installed in an hour, and deployed to 1000s of users in seconds. From meta-data to dashboards, user security and scheduling, youll only ever interact with the one application. C3 Insight significantly reduces your training, deployment and administration costs.<br/>",,Business Intelligence,,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier or Customer Admin,Agency Only,24 X 7 Bus Ex Hols,Yes,Off,Yes,,Yes,,Yes,,Yes,Off,Yes,Yes,,Yes,Off,,Yes,,Yes,Yes,&gt; 1 week,&gt; 1 week,Per instance,Australia,NSW,1.85,3.0,Australia,NSW,1.85,2.0,,,,,,,,,,,,
 C3 Business Solutions Pty Ltd,35122885465,C3 Integrity,"C3 Integrity is a multi-award winning data collection, collation and validation software tool that enables organisations to get all of their data into one, centralised location, no matter where its coming from or what format its in. It is web-based and empowers business users to own the data collection process, and puts the onus on the data submitters to provide data of a sufficient quality. C3 Business Solutions developed C3 Integrity after identifying a gap in the market. It is provided as a hosted solution, and validated data can either be export to the customer's environment or integrated with our hosted reporting solutions. Integrity is deal for agencies that collect data from disparate sources either within their agency, across other agencies, or from service providers outside their agency.<br/><br/>C3 Integrity website & 3 minute explanatory video  http://c3integrity.com/<br/><br/>C3 Integrity Overview Brochure  http://c3integrity.com/system/resources/BAhbBlsHOgZmIjMyMDEyLzEyLzA2LzEwXzU5XzU4XzUyOV9JbnRlZ3JpdHlfT3ZlcnZpZXcucGRm/Integrity%20Overview.pdf<br/><br/>C3 Integrity Govt Case Study  http://c3integrity.com/system/resources/BAhbBlsHOgZmIjgyMDEyLzEyLzA2LzExXzE4XzEzXzI0X0ludGVncml0eV9DYXNlX1N0dWR5X09FSC5wZGY/Integrity%20Case%20Study%20-%20OEH.pdf<br/><br/>Often your most valuable organisational information has been built and analysed in spreadsheets. Its the 80/20 rule where 80% of the useful information comes from 20% of the data and its often data that is hard to access and sits outside your source systems. Acquiring, processing and validating this data can be difficult, especially when its received and collated from multiple sources in many different formats from both inside your organisation and from<br/>external agencies. Integrity is a one of a kind, purpose-built tool that addresses this specific challenge.",SaaS,Information Management,,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier or Customer Admin,Agency Only,24 X 7 X 365,Yes,Off,Yes,,Yes,,Yes,,Yes,Off,Yes,Yes,,Yes,Off,,Yes,,Yes,Yes,&gt; 1 week,&gt; 1 week,Per instance,Australia,NSW,1.85,3.0,Australia,NSW,1.85,2.0,,,,,,,,,,,,
 Cloud Central Pty Ltd,26128975842,CloudCentral Enterprise ApplicationPlatform,"CloudCentral Enterprise ApplicationPlatform is a managed application development deployment platform that allows a developer / IT operations team to deploy a suitably packaged application onto the platform then have the platform manage the underlying deployment and scaling of the application. The platform is capable of auto-scaling the underlying infrastructure to support the peaks and troughs of demand encountered by applications.The platform integrates with popular application development frameworks and integrated development environments including Visual Studio and Eclipse to allow developers to publish and deploy applications directly from their native working environment.CloudCentral Enterprise ApplicationPlatform leverages underlying technology from vendors including Cumulogic, CloudFoundry and Heirloom Systems.Platform features:- Auto-Scaling- Self-Healing- High-Availability- Monitoring- Backup- Multi-Tenant- SQL Services- NoSQL Services- Application Isolation- Developer UI- Admin UI- Self Service- REST API- Version Control- Eclipse Plugin- Microsoft Visual Studio PluginSupported languages/application development frameworks:- Java- Microsoft.NET (C#, VB.net, etc)- COBOL- PHP- Ruby-on-RailsProvisioningCloudCentral provides an online web interface and application programming interface (API) to support real-time provisioning of additional resources and changes to existing resources.Data CenterCloudCentral Enterpise ApplicationPlatform is available from data centers including Canberra Data Centers (CDC) in Hume ACT, TransACT in Dickson ACT, and NextDC in Bruce ACT. These data centers offer ASIO T4 compliant physical security and connectivity to the ICON fiber network.NetworkingThis service assumes that the customer services are networked into the above mentioned data centers and that the customer will provide a direct cross connect into the Cloud Central network or participate in a network peering-exchange within the data center. Customer is responsible for any applicable cross connect fees that are levied by the respective data center.StorageCloudCentral Enterprise ApplicationPlatform is supported by Oracle Solaris ZFS data storage featuring large RAM cache, solid state disk (SSD), and serial-attached-SCSI (SAS) hard disks. The ZFS data storage platform protects against data degradation and provides enterprise level storage availability and performance.SecurityAll services are located behind DSD approved Juniper SRX firewalls and best-practice security policies and procedures are used to minimize attack surfaces and patch and secure supporting infrastructure. Network level security is enforced via Layer-2 and Layer-3 network separation and access control. CloudCentral systems administrators hold Australian Government security clearances.Software LicensingAll software licenses included except Microsoft software licenses which must be provided by customervia Microsoft Volume Sourcing Agreement (VSA).SLACloudCentral Enterprise ApplicationPlatform is provided with a %99.95 availability SLA.",PaaS,Managed Application Deployment,,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier or Customer Admin,Supplier and Agency,08 - 20 Bus Excl Hols,Yes,Yes,Yes,Off,Yes,Yes,Off,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,&gt; 60 min,&gt; 60 mins,"Enterprise.ApplicationPlatform capacity units include 1 GB RAM, 64 GB storage and 1 CPU core, and access to the management platform services.",Australia,ACT -Canberra Data Centers (Hume),1.3,Tier-3,Australia,ACT - TransACT (Dickson),1.5,Tier-3,Australia,ACT - NextDC (Bruce),1.4,Tier-3,,,,,,,,
 Cloud Central Pty Ltd,26128975842,CloudCentral Enterprise Compute,"CloudCentral Enterprise Compute is Infrastructure-as-a-Service (IaaS) that puts you in control of your environment. CloudServer's are perfect for running Web Applications, Online Services, Software-as-a-Service (SaaS), Disaster Recovery (DR), Test & Development, Enterprise Applications, Email & Collaboration, CRM, and more.CloudCentral Enterprise Compute supports the following operating systems:- Windows Server 2008 R2- Windows Server 2012- RedHat Enterprise Linux / CentOS 5 & 6- Oracle Linux 5 & 6- Ubuntu 10.04 LTS, 12.04 LTSProvisioningCloudCentral provides an online web interface and application programming interface (API) to support real-time provisioning of additional resources and changes to existing resources.Our online provisioning systems allow new resources to be provisioned in under 5 minutes, typically new Cloud Servers can be provisioned in 1-2 minutes.Data CentersCloudCentral Enterpise Compute is available from data centers including Canberra Data Centers (CDC) in Hume ACT, TransACT in Dickson ACT, and NextDC in Bruce ACT. These data centers offer ASIO T4 compliant physical security and connectivity to the ICON fiber network.NetworkingThis service assumes that the customer services are networked into the above mentioned data centers and that the customer will provide a direct cross connect into the Cloud Central network or participate in a network peering-exchange within the data center. Customer is responsible for any applicable cross connect fees that are levied by the respective data center.StorageCloudCentral Enterprise Compute is supported by Oracle Solaris ZFS data storage featuring large RAM cache, solid state disk (SSD), and serial-attached-SCSI (SAS) hard disks. The ZFS data storage platform protects against data degradation and provides enterprise level storage availability and performance.SecurityAll services are located behind DSD approved Juniper SRX firewalls and best-practice security policies and procedures are used to minimize attack surfaces and patch and secure supporting infrastructure. Network level security is enforced via Layer-2 and Layer-3 network separation and access control. CloudCentral systems administrators hold Australian Government security clearances.Software LicensingPricing assumes customer will provide software licensing for operating system and any software the customer wishes to install onto the server under the terms of its existing enterprise licensing agreements.SLACloudCentral Enterprise Compute is provided with a %99.95 availability SLA.",IaaS,Virtual Server,,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier or Customer Admin,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Yes,Off,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,&gt; 60 min,&gt; 60 mins,"Enterprise Compute capacity units include 1 GB RAM, 64 GB storage and 1 CPU core.",Australia,ACT -Canberra Data Centers (Hume),1.3,Tier-3,Australia,ACT - TransACT (Dickson),1.5,Tier-3,Australia,ACT - NextDC (Bruce),1.4,Tier-3,,,,,,,,
@@ -64,17 +64,17 @@
 Cloud Central Pty Ltd,26128975842,CloudCentral Managed Enterprise Disaster Recovery - Tier-1 (Hot DR),"CloudCentral Managed Enterprise Disaster Recovery is a managed disaster recovery service for protecting critical infrastructure.This service works by installing a disaster recovery software agent into each physical or virtual server that requires protection.There are two service levels catering for different Recovery Time Objective (RTO) requirements. This service description describes the Tier-1 'Hot DR' service level, the Tier-2 'Cold DR' service level is described separately.Hot Disaster RecoveryThe first tier service level provides for 'Hot' DR, which provides a one-for-one replica server hosted in the data center for each protected server. Changes from the protected server in the customer environment are replicated asynconrously in near real-time to the DR replica server located in the data center. In the event of a disaster, upon customer request the DR replica server can be made active within 15 minutes of receiving the request.Data CentersCloudCentral Managed Enterprise Disaster Recovery is available from data centers including Canberra Data Centers (CDC) in Hume ACT, TransACT in Dickson ACT, and NextDC in Bruce ACT. These data centers offer ASIO T4 compliant physical security and connectivity to the ICON fiber network.NetworkingThis service assumes that the customer services are networked into the above mentioned data centers and that the customer will provide a direct cross connect into the Cloud Central network or participate in a network peering-exchange within the data center. Customer is responsible for any applicable cross connect fees that are levied by the respective data center.StorageManaged Enterprise Disaster Recovery data is stored on Oracle Solaris ZFS data storage featuring large RAM cache, solid state disk (SSD), and serial-attached-SCSI (SAS) hard disks. The ZFS data storage platform protects against data degradation and provides enterprise level storage availability and performance.SecurityAll services are located behind DSD approved Juniper SRX firewalls and best-practice security policies and procedures are used to minimize attack surfaces and patch and secure supporting infrastructure. Network level security is enforced via Layer-2 and Layer-3 network separation and access control. CloudCentral systems administrators hold Australian Government security clearances.Microsoft LicensingCustomer must provide Microsoft software licenses via Microsoft Volume Sourcing Agreement (VSA).SLACloudCentral Managed Enterprise Disaster Recovery is provided with a %99.95 availability SLA. A recovery SLA of 15 minutes is provided for the Tier-1 'Hot DR' service offering, and a recovery SLA of 2 hours is provided for the Tier-2 'Cold DR' service offering.",Managed Service,Disaster Recovery,,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier or Customer Admin,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Yes,Off,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,&gt; 60 min,&gt; 60 mins,"Includes:1 GB RAM, 64 GB storage, 1 CPU core1 x DR software agent per server",Australia,ACT -Canberra Data Centers (Hume),1.3,Tier-3,Australia,ACT - TransACT (Dickson),1.5,Tier-3,Australia,ACT - NextDC (Bruce),1.4,Tier-3,,,,,,,,
 Cloud Central Pty Ltd,26128975842,CloudCentral Managed Enterprise Disaster Recovery - Tier-2 Cold DR,"CloudCentral Managed Enterprise Disaster Recovery is a managed disaster recovery service for protecting critical infrastructure.This service works by installing a disaster recovery software agent into each physical or virtual server that requires protection.There are two service levels catering for different Recovery Time Objective (RTO) requirements. This service description describes the Tier-2 'Cold DR' service level, the Tier-2 'Hot DR' service level is described separately.Cold Disaster RecoveryThe first tier service level provides for 'Cold DR', which provides a many-to-one replication of protected servers to a central DR repository hosted within a CloudCentral managed data center.A DR agent is installed into each protected server, which then replicates changes from the protected server to the DR repository asynchronously in near real-time.In the event of a disaster, upon customer request, a new virtual server will be provisioned at the data center, and the contents of the protected server will be restored to the newly provisioned server from the DR repository within 2 hours.Data CentersCloudCentral Managed Enterpise Disaster Recovery is available from data centers including Canberra Data Centers (CDC) in Hume ACT, TransACT in Dickson ACT, and NextDC in Bruce ACT. These data centers offer ASIO T4 compliant physical security and connectivity to the ICON fiber network.NetworkingThis service assumes that the customer services are networked into the above mentioned data centers and that the customer will provide a direct cross connect into the Cloud Central network or participate in a network peering-exchange within the data center. Customer is responsible for any applicable cross connect fees that are levied by the respective data center.StorageBackup data is stored on Oracle Solaris ZFS data storage featuring large RAM cache, solid state disk (SSD), and serial-attached-SCSI (SAS) hard disks. The ZFS data storage platform protects against data degredation and provides enterprise level storage availability and performance.SecurityAll services are located behind DSD approved Juniper SRX firewalls and best-practice security policies and procedures are used to minimize attack surfaces and patch and secure supporting infrastructure. Network level security is enforced via Layer-2 and Layer-3 network separation and access control. CloudCentral systems administrators hold Australian Government security clearances.Microsoft LicensingCustomer must provide Microsoft software licenses via Microsoft Volume Sourcing Agreement (VSA).SLACloudCentral Managed Enterprise Disaster Recovery is provided with a %99.95 availability SLA. A recovery SLA of 2 hours is provided for the Tier-2 'Cold DR' service offering.",Managed Service,Disaster Recovery,,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier or Customer Admin,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Yes,Off,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,&gt; 60 min,&gt; 60 mins,"Includes:- 64 GB storage on DR repository server- 24 hours per month of 1 unit compute capacity (1 GB RAM, 64 GB storage, 1 CPU core)- 1 x DR software agent per server.",Australia,ACT -Canberra Data Centers (Hume),1.3,Tier-3,Australia,ACT - TransACT (Dickson),1.5,Tier-3,Australia,ACT - NextDC (Bruce),1.4,Tier-3,,,,,,,,
 Cloud Central Pty Ltd,26128975842,CloudCentral Managed Enterprise Storage,"CloudCentral Managed Enterprise Storage includes file & block storage that is made available to customers via industry standard protocols including NFS, CIFS, and ISCSI.CloudCentral Managed Enterprise Storage can be used in conjunction with CloudCentral Enterprise Compute, or as a standalone service which is accessed over the network from the customers premise or installation within the data center.Management ServicesOur Managed Enterprise Storage storage service differs from our IaaS Enterprise Storage service in that storage management services are supplied:- capacity management- 24x7 alerting- 24x7 monitoring- security lockdown / ACL managementCloudCentral Managed Enterprise Storage is backed by Oracle ZFS data storage systems featuring large RAM cache, solid state disk (SSD), and serial-attached-SCSI (SAS) hard disks. The ZFS data storage platform protects against data degradation and provides enterprise level storage availability and performance.CloudCentral Managed Enterprise Storage is available from data centers including Canberra Data Centers (CDC) in Hume ACT, TransACT in Dickson ACT, and NextDC in Bruce ACT. These data centers offer ASIO T4 compliant physical security and connectivity to the ICON fiber network.NetworkThis service assumes that the customer services are networked into the above mentioned data centers and that the customer will provide a direct cross connect into the Cloud Central network or participate in a network peering-exchange within the data center. Customer is responsible for any applicable cross connect fees that are levied by the respective data center.StorageCloudCentral Managed Enterprise Storage is backed by Oracle ZFS data storage systems featuring large RAM cache, solid state disk (SSD), and serial-attached-SCSI (SAS) hard disks. The ZFS data storage platform protects against data degradation and provides enterprise level storage availability and performance.SecurityAll services are located behind DSD approved Juniper SRX firewalls and best-practice security policies and procedures are used to minimize attack surfaces and patch and secure supporting infrastructure. Network level security is enforced via Layer-2 and Layer-3 network separation and access control. CloudCentral systems administrators hold Australian Government security clearances.SLACloudCentral Managed Enterprise Storage is provided with a %99.95 availability SLA.",Managed Service,Storage,,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier or Customer Admin,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,Off,Yes,Yes,Yes,Off,Yes,Yes,Off,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,&gt; 60 min,&gt; 60 mins,1 GB data storage.,Australia,ACT - Canberra Data Centers (Hume),1.3,Tier-3,Australia,ACT - TransACT (Dickson),1.5,Tier-3,Australia,ACT - NextDC (Bruce),1.4,Tier-3,,,,,,,,
-Cloud Central Pty Ltd,26128975842,CloudCentral CKAN Open Data Platform-as-a-Service - Large Package,"CloudCentral CKAN Open Data Platform-as-a-Service is a fully managed open data platform delivered on a monthly service model.<br/><br/>CloudCentral is the official Open Knowledge Foundation (OKF) CKAN partner for the Australian region.  We have officially trained and certified technical resources required to deploy, integrate and provide data curation and architecture services to support the CKAN platform.<br/><br/>CloudCentral CKAN Open Data Platform-as-a-Service includes fully managed infrastructure and support required to operate production open data platforms that are capable of supporting truely massive big data sets to public and private sector data consumers.<br/><br/>CloudCentral CKAN Open Data Platform-as-a-Service is available in three diferent packages:<br/>- Small<br/>- Medium<br/>- Large<br/><br/>This service offering describes the 'Large' package which includes 'CKAN City Deployment Package' and 'CKAN Large Hosting Package'.  The inclusions of the deployment and hosting packages are detailed below.<br/><br/>CKAN City Deployment Package inclusions:<br/>- Deployment<br/>- Testing<br/>- Metadata Form Customization & Branding<br/>- 10-days Professional Services<br/><br/>CKAN Large Hosting Package inclusions:<br/>- Catalogue API<br/>- Simple Storage - 500GB<br/>- Unlimited datasets<br/>- Data API<br/>- API Calls to DataStore - 500k/day<br/>- Tech support 2 days a month SLA included<br/><br/>This service is available from CloudCentral's Canberra and Sydney Points-of-Presence (POP's) including:<br/>- NEXTDC C1 Data Centre, Bruce ACT<br/>- TransACT Data Centre, Dickson ACT<br/>- Equinix SY3 Data Centre, Alexandria NSW", ,Data Warehousing,Big Data / Open Data,24 X 7 X 365,,0.999,&gt; 2 Hours,NA,Supplier Only,Supplier Only,24 X 7 X 365,Yes,Yes,Yes,,Yes,Yes,Yes,,Yes,Yes,,,Yes,Yes,Yes,,Yes,Yes,Yes,Yes,&gt; 1 day,&gt; 1 day,CloudCentral CKAN Open Data Platform-as-a-Service is available in three diferent packages:<br/>- Small<br/>- Medium<br/>- Large<br/><br/>This service offering describes the 'Large' package which includes 'CKAN City Deployment Package' and 'CKAN Large Hosting Package'.  The inclusions of