| xqd
@@ -26,7 +26,7 @@
|
|
|
<file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2480">
|
|
|
+ <state relative-caret-position="2356">
|
|
|
<caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
| xqd
@@ -36,7 +36,7 @@
|
|
|
<file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="477">
|
|
|
+ <state relative-caret-position="446">
|
|
|
<caret line="121" column="47" lean-forward="false" selection-start-line="121" selection-start-column="47" selection-end-line="121" selection-end-column="47" />
|
|
|
<folding />
|
|
|
</state>
|
| xqd
@@ -60,10 +60,10 @@
|
|
|
<file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="529">
|
|
|
+ <state relative-caret-position="436">
|
|
|
<caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
|
|
|
<folding>
|
|
|
- <marker date="1525271072146" expanded="true" signature="18744:18756" ph="..." />
|
|
|
+ <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -87,6 +87,7 @@
|
|
|
<find>sd wk_sq_sd padding15 backfff</find>
|
|
|
<find>mn wk_f_mn padding15 backfff</find>
|
|
|
<find>ct2 wp cl week_ct2</find>
|
|
|
+ <find>jquery</find>
|
|
|
<find>$groupnav</find>
|
|
|
</findStrings>
|
|
|
</component>
|
| xqd
@@ -172,7 +173,7 @@
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
- <property name="SearchEverywhereHistoryKey" value="group_index	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php 3_diy_group_group	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php forum_group	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php group_	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php forum_gro	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php 3_3_common_showmessage	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php function/function_message	FILE	file://D:/wamp64/www/Project/zijia/source/function/function_message.php forum_ajax	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php forum_grou	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php 3_diy_group_index	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php" />
|
|
|
+ <property name="SearchEverywhereHistoryKey" value="header_no_nav	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php group_index	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php 3_diy_group_group	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php forum_group	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php group_	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php forum_gro	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php 3_3_common_showmessage	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php function/function_message	FILE	file://D:/wamp64/www/Project/zijia/source/function/function_message.php forum_ajax	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php forum_grou	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php 3_diy_group_index	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php" />
|
|
|
</component>
|
|
|
<component name="RunDashboard">
|
|
|
<option name="ruleStates">
|
| xqd
@@ -202,18 +203,18 @@
|
|
|
<workItem from="1525013350506" duration="115000" />
|
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
|
<workItem from="1525181078381" duration="610000" />
|
|
|
- <workItem from="1525227575525" duration="6984000" />
|
|
|
+ <workItem from="1525227575525" duration="7126000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="11814000" />
|
|
|
+ <option name="totallyTimeSpent" value="11956000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
|
<editor active="true" />
|
|
|
<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.25" 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="false" show_stripe_button="true" weight="0.25" 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="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="10" 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" />
|
| xqd
@@ -250,7 +251,7 @@
|
|
|
<state relative-caret-position="23901">
|
|
|
<caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
|
|
|
<folding>
|
|
|
- <marker date="1525271072146" expanded="true" signature="18744:18756" ph="..." />
|
|
|
+ <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -381,48 +382,64 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2480">
|
|
|
- <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="584">
|
|
|
+ <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
|
|
|
+ <marker date="1525269524011" expanded="true" signature="5503:5511" ph="›" />
|
|
|
+ <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header_no_nav.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$/data/template/3_diy_group_index.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">
|
|
|
- <state relative-caret-position="341">
|
|
|
- <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="1209">
|
|
|
+ <caret line="22" column="69" lean-forward="false" selection-start-line="22" selection-start-column="63" selection-end-line="22" selection-end-column="69" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="477">
|
|
|
+ <state relative-caret-position="446">
|
|
|
<caret line="121" column="47" lean-forward="false" selection-start-line="121" selection-start-column="47" selection-end-line="121" selection-end-column="47" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="584">
|
|
|
- <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
|
|
|
- <folding>
|
|
|
- <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
|
|
|
- <marker date="1525269524011" expanded="true" signature="5503:5511" ph="›" />
|
|
|
- <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="2356">
|
|
|
+ <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
|
|
|
+ <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="341">
|
|
|
+ <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="529">
|
|
|
+ <state relative-caret-position="436">
|
|
|
<caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
|
|
|
<folding>
|
|
|
- <marker date="1525271072146" expanded="true" signature="18744:18756" ph="..." />
|
|
|
+ <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|