projects / dcaas.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
attribution
attribution

file:a/.idea/workspace.xml -> file:b/.idea/workspace.xml 
--- 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="1388503952585" ignored="false" />

     <option name="TRACKING_ENABLED" value="true" />

     <option name="SHOW_DIALOG" value="false" />

     <option name="HIGHLIGHT_CONFLICTS" value="true" />

@@ -113,101 +114,7 @@
     <favorites_list name="dcaas" />

   </component>

   <component name="FileEditorManager">

-    <leaf>

-      <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">

-              <folding />

-            </state>

-          </provider>

-        </entry>

-      </file>

-      <file leaf-file-name="jquery.dynatable.css" pinned="false" current="false" current-in-tab="false">

-        <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>

-      </file>

-      <file leaf-file-name="bootstrap.css" pinned="false" current="false" current-in-tab="false">

-        <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>

-      </file>

-      <file leaf-file-name="xls2csv.py" pinned="false" current="false" current-in-tab="false">

-        <entry file="file://$PROJECT_DIR$/data/xls2csv.py">

-          <provider selected="true" editor-type-id="text-editor">

-            <state line="15" column="113" selection-start="490" selection-end="490" vertical-scroll-proportion="-8.16">

-              <folding />

-            </state>

-          </provider>

-          <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">

-            <state />

-          </provider>

-        </entry>

-      </file>

-      <file leaf-file-name="data.json.php" pinned="false" current="true" current-in-tab="true">

-        <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">

-              <folding />

-            </state>

-          </provider>

-        </entry>

-      </file>

-      <file leaf-file-name="tagcloud.css" pinned="false" current="false" current-in-tab="false">

-        <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>

-        </entry>

-      </file>

-      <file leaf-file-name="view.php" pinned="false" current="false" current-in-tab="false">

-        <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>

-      </file>

-      <file leaf-file-name="sitemap.xml.php" pinned="false" current="false" current-in-tab="false">

-        <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>

-      </file>

-      <file leaf-file-name="robots.txt" pinned="false" current="false" current-in-tab="false">

-        <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>

-      </file>

-    </leaf>

+    <leaf />

   </component>

   <component name="FindManager">

     <FindUsagesManager>

@@ -225,17 +132,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 +208,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>

@@ -551,7 +312,7 @@
   <component name="ShelveChangesManager" show_recycled="false" />

   <component name="ToolWindowManager">

     <frame x="58" y="-4" width="1626" height="1058" extended-state="6" />

-    <editor active="true" />

+    <editor active="false" />

     <layout>

       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32894737" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />

       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

@@ -559,7 +320,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="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20547074" 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 +407,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,30 +418,16 @@
         </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">

+        <state line="5" column="51" selection-start="175" selection-end="175" vertical-scroll-proportion="0.1450512">

           <folding />

         </state>

       </provider>

     </entry>

     <entry file="file://$PROJECT_DIR$/data/xls2csv.py">

       <provider selected="true" editor-type-id="text-editor">

-        <state line="15" column="113" selection-start="490" selection-end="490" vertical-scroll-proportion="-8.16">

+        <state line="15" column="113" selection-start="490" selection-end="490" vertical-scroll-proportion="0.36363637">

           <folding />

         </state>

       </provider>

@@ -690,67 +435,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="0.6215722">

+          <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="-210.3281">

+          <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="1.2764505">

+          <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="0.06215722">

+          <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="1.11883">

+          <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.058020476">

+          <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$/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">

+        <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.30357143">

           <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="91" column="48" selection-start="3457" selection-end="3481" vertical-scroll-proportion="0.5992579">

           <folding />

         </state>

       </provider>
file:a/about.php -> file:b/about.php 
--- a/about.php
+++ b/about.php
@@ -1,3 +1,13 @@
+<?php

+include("config.php");

+

+includeHeader("Data Centre as a Service (DCaaS)");

+?>

+<h1>About</h1>

+DCaaS MUL <a href="http://www.finance.gov.au/about-agimo/copyright/">provided</a> under a <a href="http://creativecommons.org/licenses/by/3.0/au/">Creative Commons Attribution 3.0 Australia</a> licence.</p> http://www.finance.gov.au/about-agimo/copyright/

 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();
file:a/config.php -> file:b/config.php 
--- 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 -->
file:a/data/DCaaS+Catalogue+September+2013 Public.xls -> file:b/data/DCaaS+Catalogue+September+2013 Public.xls 
 Binary files a/data/DCaaS+Catalogue+September+2013 Public.xls and b/data/DCaaS+Catalogue+September+2013 Public.xls differ
file:a/data/DCaaS+Catalogue+September+2013 PublicDCaaS_AFI_Part_3_Sec_5_Service_.csv -> file:b/data/DCaaS+Catalogue+September+2013 PublicDCaaS_AFI_Part_3_Sec_5_Service_.csv 
--- 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