--- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -54,7 +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" /> + <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" /> @@ -114,101 +114,7 @@ <favorites_list name="dcaas" /> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="config.php" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/config.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="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> - </entry> - </file> - <file leaf-file-name="jquery.dynatable.css" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/js/dynatable/jquery.dynatable.css"> - <provider selected="true" editor-type-id="text-editor"> - <state line="2" column="16" selection-start="0" selection-end="83" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="bootstrap.css" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/css/bootstrap.css"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="xls2csv.py" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/data/xls2csv.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="15" column="113" selection-start="490" selection-end="490" vertical-scroll-proportion="-8.16"> - <folding /> - </state> - </provider> - <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider"> - <state /> - </provider> - </entry> - </file> - <file leaf-file-name="data.json.php" pinned="false" current="false" current-in-tab="false"> - <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> - </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="view.php" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/view.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="60" selection-start="1888" selection-end="1888" vertical-scroll-proportion="-23.538462"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="sitemap.xml.php" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sitemap.xml.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="20" column="17" selection-start="876" selection-end="876" vertical-scroll-proportion="-13.076923"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="robots.txt" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/robots.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="51" selection-start="175" selection-end="175" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -406,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" /> @@ -414,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.3384224" 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" /> @@ -514,14 +420,14 @@ </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"> + <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> @@ -531,21 +437,21 @@ </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"> + <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="0.0"> + <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="0.0"> + <state line="44" column="17" selection-start="642" selection-end="642" vertical-scroll-proportion="1.2764505"> <folding /> </state> </provider> @@ -559,21 +465,21 @@ </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"> + <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="-23.538462"> + <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.0"> + <state line="2" column="16" selection-start="0" selection-end="83" vertical-scroll-proportion="0.058020476"> <folding /> </state> </provider> @@ -585,23 +491,23 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/index.php"> + <provider selected="true" editor-type-id="text-editor"> + <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="-12.423077"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/index.php"> - <provider selected="true" editor-type-id="text-editor"> - <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"> + <state line="91" column="48" selection-start="3457" selection-end="3481" vertical-scroll-proportion="0.5992579"> <folding /> </state> </provider>