domain in robots.txt
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,27 +3,58 @@
<component name="ChangeListManager">
<list default="true" id="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" name="Default" comment="">
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/fonts/glyphicons-halflings-regular.ttf" afterPath="$PROJECT_DIR$/fonts/glyphicons-halflings-regular.ttf" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/fonts/glyphicons-halflings-regular.woff" afterPath="$PROJECT_DIR$/fonts/glyphicons-halflings-regular.woff" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/img/icon_2567.png" afterPath="$PROJECT_DIR$/img/icon_2567.png" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/tag-cloud" afterPath="$PROJECT_DIR$/lib/tag-cloud" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitmodules" afterPath="$PROJECT_DIR$/.gitmodules" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.name" afterPath="$PROJECT_DIR$/.idea/.name" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/DCaaS+Catalogue+September+2013 PublicDCaaS_AFI_Part_3_Sec_5_Service_.csv" afterPath="$PROJECT_DIR$/data/DCaaS+Catalogue+September+2013 PublicDCaaS_AFI_Part_3_Sec_5_Service_.csv" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/about.php" afterPath="$PROJECT_DIR$/about.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/bootstrap-theme.css" afterPath="$PROJECT_DIR$/css/bootstrap-theme.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/bootstrap-theme.min.css" afterPath="$PROJECT_DIR$/css/bootstrap-theme.min.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/bootstrap.css" afterPath="$PROJECT_DIR$/css/bootstrap.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/bootstrap.js" afterPath="$PROJECT_DIR$/js/bootstrap.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/bootstrap.min.css" afterPath="$PROJECT_DIR$/css/bootstrap.min.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/bootstrap.min.js" afterPath="$PROJECT_DIR$/js/bootstrap.min.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config.php" afterPath="$PROJECT_DIR$/config.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data.json.php" afterPath="$PROJECT_DIR$/data.json.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dcaas.iml" afterPath="$PROJECT_DIR$/dcaas.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/fonts/glyphicons-halflings-regular.svg" afterPath="$PROJECT_DIR$/fonts/glyphicons-halflings-regular.svg" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/img/icon_2567.svg" afterPath="$PROJECT_DIR$/img/icon_2567.svg" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/import.php" afterPath="$PROJECT_DIR$/data/import.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.php" afterPath="$PROJECT_DIR$/index.php" />
+ <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="1388122416019" 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="1388236421813" ignored="false" />
- <file path="/config.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388237513189" ignored="false" />
+ <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="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" />
+ <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" />
@@ -83,56 +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="13" column="15" selection-start="420" selection-end="420" vertical-scroll-proportion="-8.5">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="import.php" pinned="false" current="true" current-in-tab="true">
- <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.39534885">
- <folding />
- </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="2" column="0" selection-start="30" selection-end="30" vertical-scroll-proportion="-1.3076923">
- <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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
- <folding>
- <marker date="1388131247000" expanded="false" signature="453:465" placeholder="..." />
- <marker date="1388131247000" expanded="false" signature="822:854" placeholder="..." />
- <marker date="1388131247000" expanded="true" signature="1739:1817" placeholder="..." />
- <marker date="1388131247000" expanded="true" signature="2136:2329" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2156:2255" placeholder="{"paginate": false...}" />
- <marker date="1388131247000" expanded="true" signature="2273:2323" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2423:2628" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2510:2617" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2649:2907" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2673:2819" placeholder="{"paginate": false...}" />
- <marker date="1388131247000" expanded="true" signature="2841:2897" placeholder="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -150,9 +132,17 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
+ <option value="$PROJECT_DIR$/lib/tag-cloud/css/tagcloud.css" />
+ <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$/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$/config.php" />
<option value="$PROJECT_DIR$/data/import.php" />
+ <option value="$PROJECT_DIR$/about.php" />
</list>
</option>
</component>
@@ -190,7 +180,6 @@
</navigator>
<panes>
<pane id="PackagesPane" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -223,20 +212,44 @@
<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="css" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="MemberChooser.sorted" value="false" />
+ <property name="MemberChooser.showClasses" value="true" />
<property name="FullScreen" value="false" />
- <property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
<property name="MemberChooser.copyJavadoc" value="false" />
</component>
+ <component name="RecentsManager">
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="Z:\Sites\dcaas" />
+ </key>
+ </component>
<component name="RunManager">
+ <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
+ <TestRunner />
+ <method />
+ </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -301,24 +314,25 @@
<frame x="58" y="-4" width="1626" height="1058" extended-state="6" />
<editor active="false" />
<layout>
- <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="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <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" />
+ <window_info id="Palette" 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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32894737" sideWeight="0.5" order="1" 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="-1" 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.25508904" 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="-1" 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="-1" side_tool="true" 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" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" 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" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32894737" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -363,7 +377,7 @@
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" />
+ <option name="LAST_COMMIT_MESSAGE" value="ajax table" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -377,47 +391,123 @@
<option name="UPDATE_FILTER_BY_SCOPE" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+ <MESSAGE value="ajax table" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
+ <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>
- <marker date="1388131247000" expanded="false" signature="453:465" placeholder="..." />
- <marker date="1388131247000" expanded="false" signature="822:854" placeholder="..." />
- <marker date="1388131247000" expanded="true" signature="1739:1817" placeholder="..." />
- <marker date="1388131247000" expanded="true" signature="2136:2329" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2156:2255" placeholder="{"paginate": false...}" />
- <marker date="1388131247000" expanded="true" signature="2273:2323" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2423:2628" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2510:2617" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2649:2907" placeholder="{...}" />
- <marker date="1388131247000" expanded="true" signature="2673:2819" placeholder="{"paginate": false...}" />
- <marker date="1388131247000" expanded="true" signature="2841:2897" placeholder="{...}" />
- </folding>
+ <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.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="0.36363637">
+ <folding />
+ </state>
+ </provider>
+ <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">
+ <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="2" column="0" selection-start="30" selection-end="30" vertical-scroll-proportion="-1.3076923">
+ <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="13" column="15" selection-start="420" selection-end="420" vertical-scroll-proportion="-8.5">
- <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.39534885">
+ <state line="91" column="48" selection-start="3457" selection-end="3481" vertical-scroll-proportion="0.5992579">
<folding />
</state>
</provider>
--- /dev/null
+++ b/about.php
@@ -1,1 +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
@@ -1,109 +1,130 @@
<?php
define('__ROOT__', dirname(__FILE__));
// Set default timezone
- date_default_timezone_set('UTC');
-
- try {
+date_default_timezone_set('UTC');
+
+try {
/**************************************
- * Create databases and *
- * open connections *
- **************************************/
-
+ * Create databases and *
+ * open connections *
+ **************************************/
+
// Create (connect to) SQLite database in file
- $db = new PDO('sqlite:'.__ROOT__.'/data/dcaas.sqlite3');
+ $db = new PDO('sqlite:' . __ROOT__ . '/data/dcaas.sqlite3');
// Set errormode to exceptions
- $db->setAttribute(PDO::ATTR_ERRMODE,
- PDO::ERRMODE_EXCEPTION);
- }
- catch(PDOException $e) {
+ $db->setAttribute(PDO::ATTR_ERRMODE,
+ PDO::ERRMODE_EXCEPTION);
+} catch (PDOException $e) {
// Print PDOException message
echo $e->getMessage();
- }
+}
+function local_url()
+{
+ return "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/";
+}
-function includeHeader($title) {
-?>
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
- <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+function includeHeader($title)
+{
+ ?>
+ <!DOCTYPE html>
+ <html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="">
+ <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
- <title>Starter Template for Bootstrap</title>
+ <title><?= $title ?></title>
- <!-- Bootstrap core CSS -->
- <link href="js/dynatable/jquery.dynatable.css" rel="stylesheet">
- <link href="css/bootstrap.css" rel="stylesheet">
+ <!-- Bootstrap core CSS -->
- <!-- Custom styles for this template
- <link href="starter-template.css" rel="stylesheet">-->
+ <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">-->
- <!-- Just for debugging purposes. Don't actually copy this line! -->
- <!--[if lt IE 9]>
- <script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- Just for debugging purposes. Don't actually copy this line! -->
+ <!--[if lt IE 9]>
+ <script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
- <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
- <!--[if lt IE 9]>
- <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
- <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
- <![endif]-->
-</head>
+ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>