|
@@ -2,8 +2,8 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
<change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
<change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
- <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.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" />
|
|
@@ -17,8 +17,8 @@
|
|
<file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="false">
|
|
<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">
|
|
<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="260">
|
|
|
|
- <caret line="87" column="76" lean-forward="false" selection-start-line="87" selection-start-column="43" selection-end-line="87" selection-end-column="76" />
|
|
|
|
|
|
+ <state relative-caret-position="326">
|
|
|
|
+ <caret line="200" column="0" lean-forward="false" selection-start-line="200" selection-start-column="0" selection-end-line="208" selection-end-column="10" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -61,10 +61,10 @@
|
|
<file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
|
|
<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">
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="310">
|
|
|
|
- <caret line="32" column="30" lean-forward="false" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
|
|
|
|
|
|
+ <state relative-caret-position="853">
|
|
|
|
+ <caret line="1408" column="11" lean-forward="false" selection-start-line="1408" selection-start-column="11" selection-end-line="1408" selection-end-column="11" />
|
|
<folding>
|
|
<folding>
|
|
- <marker date="1525269559990" expanded="true" signature="18002:18014" ph="..." />
|
|
|
|
|
|
+ <marker date="1525270091617" expanded="true" signature="18737:18749" ph="..." />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -86,6 +86,9 @@
|
|
<find>$parentid</find>
|
|
<find>$parentid</find>
|
|
<find>print_r</find>
|
|
<find>print_r</find>
|
|
<find>$groupnav</find>
|
|
<find>$groupnav</find>
|
|
|
|
+ <find>sd wk_sq_sd padding15 backfff</find>
|
|
|
|
+ <find>mn wk_f_mn padding15 backfff</find>
|
|
|
|
+ <find>ct2 wp cl week_ct2</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -170,7 +173,7 @@
|
|
<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="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_index	FILE	file://D:/wamp64/www/Project/zijia/source/module/group/group_index.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="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>
|
|
<component name="RunDashboard">
|
|
<component name="RunDashboard">
|
|
<option name="ruleStates">
|
|
<option name="ruleStates">
|
|
@@ -200,12 +203,12 @@
|
|
<workItem from="1525013350506" duration="115000" />
|
|
<workItem from="1525013350506" duration="115000" />
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
<workItem from="1525181078381" duration="610000" />
|
|
<workItem from="1525181078381" duration="610000" />
|
|
- <workItem from="1525227575525" duration="5481000" />
|
|
|
|
|
|
+ <workItem from="1525227575525" duration="6009000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="10311000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="10839000" />
|
|
</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" />
|
|
@@ -248,7 +251,7 @@
|
|
<state relative-caret-position="23901">
|
|
<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" />
|
|
<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>
|
|
<folding>
|
|
- <marker date="1525269559990" expanded="true" signature="18002:18014" ph="..." />
|
|
|
|
|
|
+ <marker date="1525270091617" expanded="true" signature="18737:18749" ph="..." />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -326,14 +329,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</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="260">
|
|
|
|
- <caret line="87" column="76" lean-forward="false" selection-start-line="87" selection-start-column="43" selection-end-line="87" selection-end-column="76" />
|
|
|
|
- <folding />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </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="-160">
|
|
<state relative-caret-position="-160">
|
|
@@ -415,12 +410,20 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</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="326">
|
|
|
|
+ <caret line="200" column="0" lean-forward="false" selection-start-line="200" selection-start-column="0" selection-end-line="208" selection-end-column="10" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="310">
|
|
|
|
- <caret line="32" column="30" lean-forward="false" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
|
|
|
|
|
|
+ <state relative-caret-position="853">
|
|
|
|
+ <caret line="1408" column="11" lean-forward="false" selection-start-line="1408" selection-start-column="11" selection-end-line="1408" selection-end-column="11" />
|
|
<folding>
|
|
<folding>
|
|
- <marker date="1525269559990" expanded="true" signature="18002:18014" ph="..." />
|
|
|
|
|
|
+ <marker date="1525270091617" expanded="true" signature="18737:18749" ph="..." />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|