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