domain in robots.txt
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/robots.txt" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/sitemap.xml.php" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/view.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/DCaaS+Catalogue+September+2013 Public.xls" afterPath="$PROJECT_DIR$/data/DCaaS+Catalogue+September+2013 Public.xls" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/img/csv.gif" afterPath="$PROJECT_DIR$/img/csv.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/fonts/glyphicons-halflings-regular.eot" afterPath="$PROJECT_DIR$/fonts/glyphicons-halflings-regular.eot" />
@@ -35,25 +32,29 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/img/license.txt" afterPath="$PROJECT_DIR$/img/license.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/robots.txt" afterPath="$PROJECT_DIR$/robots.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sitemap.xml.php" afterPath="$PROJECT_DIR$/sitemap.xml.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/table.php" afterPath="$PROJECT_DIR$/table.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view.php" afterPath="$PROJECT_DIR$/view.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/xls2csv.py" afterPath="$PROJECT_DIR$/data/xls2csv.py" />
</list>
<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="1388400418216" 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="1388344717435" ignored="false" />
- <file path="/table.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388344953688" ignored="false" />
- <file path="/view.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388493089071" 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" />
+ <file path="/view.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388496818732" ignored="false" />
<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,105 +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="15" column="32" selection-start="514" selection-end="514" vertical-scroll-proportion="2.3076923">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="import.php" pinned="false" current="false" current-in-tab="false">
- <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>
- </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="index.php" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/index.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="25" column="4" selection-start="829" selection-end="903" vertical-scroll-proportion="2.3076923">
- <folding>
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <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="7" column="0" selection-start="307" selection-end="563" vertical-scroll-proportion="2.3076923">
- <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="18" column="45" selection-start="501" selection-end="501" vertical-scroll-proportion="2.3076923">
- <folding>
- <marker date="1388492974000" expanded="true" signature="1574:2226" placeholder="/*...*/" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="view.php" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/view.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="29" column="139" selection-start="1669" selection-end="1669" vertical-scroll-proportion="0.6837294">
- <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="2.3076923">
- <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>
@@ -229,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$/data.json.php" />
- <option value="$PROJECT_DIR$/table.php" />
<option value="$PROJECT_DIR$/robots.txt" />
- <option value="$PROJECT_DIR$/config.php" />
<option value="$PROJECT_DIR$/sitemap.xml.php" />
<option value="$PROJECT_DIR$/data/xls2csv.py" />
<option value="$PROJECT_DIR$/view.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>
@@ -305,11 +208,7 @@
<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="myItemId" value="data" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -323,43 +222,7 @@
<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="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>
</PATH>
@@ -449,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" />
@@ -457,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" />
@@ -534,69 +397,37 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/config.php">
+ <entry file="file://$PROJECT_DIR$/data/import.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="29" column="34" selection-start="1266" selection-end="1266" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <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 />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/table.php">
<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$/data/import.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="29" column="34" selection-start="1266" selection-end="1266" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <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>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/table.php">
- <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>
- <marker date="1388492974000" expanded="true" signature="1574:2226" placeholder="/*...*/" />
- </folding>
- </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$/config.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="15" column="32" selection-start="514" selection-end="514" vertical-scroll-proportion="2.3076923">
- <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>
@@ -604,48 +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="4" selection-start="829" selection-end="903" vertical-scroll-proportion="2.3076923">
- <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$/data.json.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="7" column="0" selection-start="307" selection-end="563" vertical-scroll-proportion="2.3076923">
- <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="18" column="45" selection-start="501" selection-end="501" vertical-scroll-proportion="2.3076923">
- <folding>
- <marker date="1388492974000" expanded="true" signature="1574:2226" placeholder="/*...*/" />
- </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="2.3076923">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/view.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="29" column="139" selection-start="1669" selection-end="1669" vertical-scroll-proportion="0.6837294">
+ <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="91" column="48" selection-start="3457" selection-end="3481" vertical-scroll-proportion="0.5992579">
<folding />
</state>
</provider>
--- 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();
--- a/config.php
+++ b/config.php
@@ -43,7 +43,15 @@
<link href="js/dynatable/jquery.dynatable.css" rel="stylesheet">
<link href="lib/tag-cloud/css/tagcloud.css" rel="stylesheet">
<link href="css/bootstrap.css" rel="stylesheet">
-
+ <style>
+ th a {
+ color: #428bca;
+ }
+ th a:hover {
+ color: #428bca;
+ text-decoration: underline;
+ }
+ </style>
<!-- Custom styles for this template
<link href="starter-template.css" rel="stylesheet">-->
@@ -76,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.json.php
+++ b/data.json.php
@@ -5,12 +5,33 @@
$page = filter_input(INPUT_GET, 'page', FILTER_SANITIZE_NUMBER_INT);
$perPage = filter_input(INPUT_GET, 'perPage', FILTER_SANITIZE_NUMBER_INT);
$offset = filter_input(INPUT_GET, 'offset', FILTER_SANITIZE_NUMBER_INT);
-$query = "Select acnabn, service_name from dcaas_services order by acnabn";
+$search = preg_replace("/[^a-zA-Z0-9]+/", "", filter_var($_GET['queries']['search'], FILTER_SANITIZE_STRING));
+$sortby = 'acnabn';
+if (isset($_GET['sorts'])) {
+ $keys = array_keys($_GET['sorts']);
+ if (in_array($keys[0], array('trading_or_business_name', 'acnabn', 'service', 'service_category', 'service_sub_category'))) {
+ $sortby = preg_replace("/[^a-zA-Z0-9_]+/", "", $keys[0]);
+ if ($sortby == 'service') $sortby = 'service_name';
+ }
+}
+$select_columns = 'Select trading_or_business_name, acnabn, service_name, service_category, service_sub_category ';
+$query = " from dcaas_services "
+ . ($search != "" ? " where service_name like '%$search%'" : "");
$total = $db->query("select count(*) from dcaas_services")->fetch(PDO::FETCH_NUM);
-foreach ($db->query($query . " limit $offset," . ($page * $perPage), PDO::FETCH_ASSOC) as $row) {
+$query_total = $db->query("select count(*) ".$query)->fetch(PDO::FETCH_NUM);
+
+/* http://www.sqlite.org/lang_select.html
+Instead of a separate OFFSET clause, the LIMIT clause may specify two scalar expressions separated by a comma.
+In this case, the first expression is used as the OFFSET expression and the second as the LIMIT expression.
+This is counter-intuitive, as when using the OFFSET clause the second of the two expressions is the OFFSET
+and the first the LIMIT. This is intentional - it maximizes compatibility with other SQL database systems.*/
+$limit = "limit $offset, $perPage";
+
+foreach ($db->query($select_columns .$query . " order by $sortby $limit", PDO::FETCH_ASSOC) as $row) {
+ $row['service'] = '<a href="view.php?acnabn=' . $row['acnabn'] . "&service_name=" . $row['service_name'] . '">' . $row['service_name'] . "</a>";
$result['records'][] = $row;
}
-$result['queryRecordCount'] = intval($total[0]);
+$result['queryRecordCount'] = intval($query_total[0]);
$result['totalRecordCount'] = intval($total[0]);
echo json_encode($result);
?>
Binary files a/data/DCaaS+Catalogue+September+2013 Public.xls and b/data/DCaaS+Catalogue+September+2013 Public.xls differ