--- 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,9 +32,12 @@ <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> @@ -46,11 +46,11 @@ <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="/config.php" changelist="816b2800-4ae7-4ee2-9d29-ebf91af07d7d" time="1388498839775" 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" /> @@ -117,16 +117,25 @@ <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"> + <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> @@ -144,21 +153,10 @@ </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"> + <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="7" column="0" selection-start="307" selection-end="563" vertical-scroll-proportion="2.3076923"> + <state line="21" column="45" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.45535713"> <folding /> </state> </provider> @@ -176,18 +174,16 @@ <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"> + <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="29" column="139" selection-start="1669" selection-end="1669" vertical-scroll-proportion="0.6837294"> + <state line="36" column="60" selection-start="1888" selection-end="1888" vertical-scroll-proportion="-23.538462"> <folding /> </state> </provider> @@ -196,7 +192,7 @@ <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"> + <state line="20" column="17" selection-start="876" selection-end="876" vertical-scroll-proportion="-13.076923"> <folding /> </state> </provider> @@ -233,13 +229,13 @@ <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$/config.php" /> + <option value="$PROJECT_DIR$/table.php" /> + <option value="$PROJECT_DIR$/data.json.php" /> </list> </option> </component> @@ -331,6 +327,66 @@ <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> @@ -345,6 +401,38 @@ <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> @@ -360,6 +448,20 @@ </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="data" /> + <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> @@ -534,13 +636,6 @@ <breakpoint-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/config.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"> @@ -560,9 +655,7 @@ <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> + <folding /> </state> </provider> </entry> @@ -576,13 +669,6 @@ <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> @@ -606,46 +692,65 @@ </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"> + <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="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="21" column="45" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.45535713"> <folding /> </state> </provider>