|
@@ -2,8 +2,12 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="b6faea92-a65d-441a-9752-2f40c137a7e3" name="Default" comment="">
|
|
<list default="true" id="b6faea92-a65d-441a-9752-2f40c137a7e3" name="Default" comment="">
|
|
|
|
+ <change beforePath="" afterPath="$PROJECT_DIR$/data/attachment/group/slick/111.png" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/config/config_global.php" afterPath="$PROJECT_DIR$/config/config_global.php" />
|
|
<change beforePath="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
|
|
<change beforePath="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
|
|
- <change beforePath="$PROJECT_DIR$/source/module/group/group_index.php" afterPath="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -13,12 +17,12 @@
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
</component>
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
- <leaf>
|
|
|
|
|
|
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
|
|
<file leaf-file-name="group.php" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="group.php" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/group.php">
|
|
<entry file="file://$PROJECT_DIR$/group.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="-108">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
|
|
+ <state relative-caret-position="775">
|
|
|
|
+ <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -27,41 +31,38 @@
|
|
<file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
<entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="388">
|
|
|
|
|
|
+ <state relative-caret-position="397">
|
|
<caret line="146" column="21" lean-forward="false" selection-start-line="146" selection-start-column="21" selection-end-line="146" selection-end-column="21" />
|
|
<caret line="146" column="21" lean-forward="false" selection-start-line="146" selection-start-column="21" selection-end-line="146" selection-end-column="21" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="function_core.php" pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
|
|
|
+ <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="true">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="305">
|
|
|
|
- <caret line="518" column="9" lean-forward="false" selection-start-line="518" selection-start-column="9" selection-end-line="518" selection-end-column="9" />
|
|
|
|
- <folding>
|
|
|
|
- <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
|
- <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
|
- </folding>
|
|
|
|
|
|
+ <state relative-caret-position="430">
|
|
|
|
+ <caret line="123" column="26" lean-forward="false" selection-start-line="123" selection-start-column="26" selection-end-line="123" selection-end-column="26" />
|
|
|
|
+ <folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="3_3_common_header_no_nav.tpl.php" pinned="false" current-in-tab="true">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
|
|
|
|
|
|
+ <file leaf-file-name="week_nav.js" pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/images/js/week_nav.js">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="384">
|
|
|
|
- <caret line="85" column="71" lean-forward="false" selection-start-line="85" selection-start-column="71" selection-end-line="85" selection-end-column="71" />
|
|
|
|
|
|
+ <state relative-caret-position="403">
|
|
|
|
+ <caret line="31" column="46" lean-forward="false" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="46" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
|
|
|
|
|
|
+ <file leaf-file-name="3_3_common_header_no_nav.tpl.php" pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="124">
|
|
|
|
- <caret line="4" column="15" lean-forward="true" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
|
|
|
|
|
|
+ <state relative-caret-position="260">
|
|
|
|
+ <caret line="47" column="70" lean-forward="false" selection-start-line="47" selection-start-column="70" selection-end-line="47" selection-end-column="70" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -72,6 +73,9 @@
|
|
<component name="FindInProjectRecents">
|
|
<component name="FindInProjectRecents">
|
|
<findStrings>
|
|
<findStrings>
|
|
<find>login</find>
|
|
<find>login</find>
|
|
|
|
+ <find>id="wp</find>
|
|
|
|
+ <find>week_nav</find>
|
|
|
|
+ <find>jquery</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -86,9 +90,12 @@
|
|
<option value="$PROJECT_DIR$/admin.php" />
|
|
<option value="$PROJECT_DIR$/admin.php" />
|
|
<option value="$PROJECT_DIR$/source/admincp/admincp_login.php" />
|
|
<option value="$PROJECT_DIR$/source/admincp/admincp_login.php" />
|
|
<option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header_no_nav.php" />
|
|
<option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header_no_nav.php" />
|
|
- <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
|
|
|
|
|
|
+ <option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/.gitignore" />
|
|
|
|
+ <option value="$PROJECT_DIR$/group.php" />
|
|
<option value="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
<option value="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
<option value="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
|
|
<option value="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -133,63 +140,57 @@
|
|
<path>
|
|
<path>
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
- <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
|
|
+ <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
- <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
- <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- </path>
|
|
|
|
- <path>
|
|
|
|
- <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="module" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
|
|
+ <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
+ <item name="attachment" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
- <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="module" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
|
|
+ <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
+ <item name="attachment" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="group" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="group" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
- <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- </path>
|
|
|
|
- <path>
|
|
|
|
- <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="wfdsoft_jiaohu" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
|
|
+ <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
+ <item name="attachment" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
+ <item name="group" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
+ <item name="slick" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
+ <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
- <item name="wfdsoft_jiaohu" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="common" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
</path>
|
|
</path>
|
|
</expand>
|
|
</expand>
|
|
<select />
|
|
<select />
|
|
</subPane>
|
|
</subPane>
|
|
</pane>
|
|
</pane>
|
|
- <pane id="Scope" />
|
|
|
|
<pane id="Scratches" />
|
|
<pane id="Scratches" />
|
|
|
|
+ <pane id="Scope" />
|
|
</panes>
|
|
</panes>
|
|
</component>
|
|
</component>
|
|
<component name="PropertiesComponent">
|
|
<component name="PropertiesComponent">
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
|
+ <property name="SearchEverywhereHistoryKey" value="week_nav	FILE	file://D:/wamp64/www/Project/zijia/template/wfdsoft_jiaohu/images/js/week_nav.js header_no	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php 3_diy_group_index	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php group/group_i	FILE	file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php" />
|
|
</component>
|
|
</component>
|
|
<component name="RecentsManager">
|
|
<component name="RecentsManager">
|
|
|
|
+ <key name="MoveFile.RECENT_KEYS">
|
|
|
|
+ <recent name="D:\wamp64\www\Project\zijia\data\attachment\group\slick" />
|
|
|
|
+ </key>
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<recent name="D:\wamp64\www\Project\zijia\data\template" />
|
|
<recent name="D:\wamp64\www\Project\zijia\data\template" />
|
|
<recent name="D:\wamp64\www\Project\zijia\template\wfdsoft_jiaohu\common" />
|
|
<recent name="D:\wamp64\www\Project\zijia\template\wfdsoft_jiaohu\common" />
|
|
@@ -230,36 +231,37 @@
|
|
<workItem from="1524101424073" duration="15000" />
|
|
<workItem from="1524101424073" duration="15000" />
|
|
<workItem from="1524727323225" duration="1868000" />
|
|
<workItem from="1524727323225" duration="1868000" />
|
|
<workItem from="1524830861798" duration="5000" />
|
|
<workItem from="1524830861798" duration="5000" />
|
|
- <workItem from="1524881363592" duration="1549000" />
|
|
|
|
|
|
+ <workItem from="1524881363592" duration="3990000" />
|
|
|
|
+ <workItem from="1524966401684" duration="4177000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="21036000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="27654000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
<editor active="true" />
|
|
<editor active="true" />
|
|
<layout>
|
|
<layout>
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23489584" sideWeight="0.5" 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" show_stripe_button="true" weight="0.2171875" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
|
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
|
|
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
|
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" 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" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" 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" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
|
</layout>
|
|
</layout>
|
|
</component>
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -273,48 +275,6 @@
|
|
<watches-manager />
|
|
<watches-manager />
|
|
</component>
|
|
</component>
|
|
<component name="editorHistoryManager">
|
|
<component name="editorHistoryManager">
|
|
- <entry file="file://$PROJECT_DIR$/template/default/portal/portalcp_block_thumbsetting.htm">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="0">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/template/default/portal/diyxml/portal_topic_grey.xml">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="-1581">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/group/group_my.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="0">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/template/default/portal/portalcp_login.htm">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="0">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/portal/portal_list.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="0">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/source/class/class_core.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="279">
|
|
|
|
- <caret line="62" column="5" lean-forward="true" selection-start-line="62" selection-start-column="5" selection-end-line="62" selection-end-column="5" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_portal.php">
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_portal.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="212">
|
|
<state relative-caret-position="212">
|
|
@@ -544,19 +504,10 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/group.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="-108">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
- <folding />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/data/diy/template/wfdsoft_jiaohu/forum/discuz.htm">
|
|
<entry file="file://$PROJECT_DIR$/data/diy/template/wfdsoft_jiaohu/forum/discuz.htm">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-5208">
|
|
<state relative-caret-position="-5208">
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
- <folding />
|
|
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -564,7 +515,6 @@
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
- <folding />
|
|
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -572,7 +522,6 @@
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="589">
|
|
<state relative-caret-position="589">
|
|
<caret line="14" column="4" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
|
|
<caret line="14" column="4" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
|
|
- <folding />
|
|
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -580,7 +529,6 @@
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
- <folding />
|
|
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -588,37 +536,43 @@
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
- <folding />
|
|
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_group_index.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="124">
|
|
|
|
- <caret line="4" column="15" lean-forward="true" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
|
|
|
|
|
|
+ <state relative-caret-position="-6649">
|
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="0">
|
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="388">
|
|
|
|
- <caret line="146" column="21" lean-forward="false" selection-start-line="146" selection-start-column="21" selection-end-line="146" selection-end-column="21" />
|
|
|
|
|
|
+ <state relative-caret-position="186">
|
|
|
|
+ <caret line="6" column="7" lean-forward="false" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_group_index.tpl.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="-6649">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
|
|
+ <state relative-caret-position="279">
|
|
|
|
+ <caret line="9" column="39" lean-forward="true" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="305">
|
|
|
|
|
|
+ <state relative-caret-position="31">
|
|
<caret line="518" column="9" lean-forward="false" selection-start-line="518" selection-start-column="9" selection-end-line="518" selection-end-column="9" />
|
|
<caret line="518" column="9" lean-forward="false" selection-start-line="518" selection-start-column="9" selection-end-line="518" selection-end-column="9" />
|
|
<folding>
|
|
<folding>
|
|
<marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
<marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
@@ -627,10 +581,58 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global_default.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="0">
|
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/group.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="775">
|
|
|
|
+ <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="314">
|
|
|
|
+ <caret line="3617" column="4" lean-forward="false" selection-start-line="3617" selection-start-column="4" selection-end-line="3617" selection-end-column="4" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/images/js/week_nav.js">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="403">
|
|
|
|
+ <caret line="31" column="46" lean-forward="false" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="46" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="397">
|
|
|
|
+ <caret line="146" column="21" lean-forward="false" selection-start-line="146" selection-start-column="21" selection-end-line="146" selection-end-column="21" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="384">
|
|
|
|
- <caret line="85" column="71" lean-forward="false" selection-start-line="85" selection-start-column="71" selection-end-line="85" selection-end-column="71" />
|
|
|
|
|
|
+ <state relative-caret-position="260">
|
|
|
|
+ <caret line="47" column="70" lean-forward="false" selection-start-line="47" selection-start-column="70" selection-end-line="47" selection-end-column="70" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="430">
|
|
|
|
+ <caret line="123" column="26" lean-forward="false" selection-start-line="123" selection-start-column="26" selection-end-line="123" selection-end-column="26" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|