| xqd
@@ -58,29 +58,29 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <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="false">
|
|
|
<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="581">
|
|
|
- <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
|
|
|
+ <state relative-caret-position="550">
|
|
|
+ <caret line="17" column="81" lean-forward="true" selection-start-line="17" selection-start-column="81" selection-end-line="17" selection-end-column="81" />
|
|
|
<folding>
|
|
|
- <marker date="1525272217914" expanded="true" signature="18744:18756" ph="..." />
|
|
|
+ <marker date="1525272246879" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="common.js" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/static/js/common.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="221">
|
|
|
- <caret line="1204" column="27" lean-forward="false" selection-start-line="1204" selection-start-column="27" selection-end-line="1204" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="283">
|
|
|
+ <caret line="1209" column="49" lean-forward="true" selection-start-line="1209" selection-start-column="49" selection-end-line="1209" selection-end-column="49" />
|
|
|
<folding>
|
|
|
- <marker date="1525272208397" expanded="true" signature="32210:32216" ph=" " />
|
|
|
- <marker date="1525272208397" expanded="true" signature="32216:32222" ph=" " />
|
|
|
- <marker date="1525272208397" expanded="true" signature="36377:36383" ph=" " />
|
|
|
- <marker date="1525272208397" expanded="true" signature="36383:36389" ph=" " />
|
|
|
- <marker date="1525272208397" expanded="true" signature="41694:41700" ph="..." />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="32210:32216" ph=" " />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="32216:32222" ph=" " />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="36361:36367" ph=" " />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="36367:36373" ph=" " />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="41678:41684" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -126,8 +126,8 @@
|
|
|
<option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
<option value="$PROJECT_DIR$/source/function/function_group.php" />
|
|
|
<option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
|
- <option value="$PROJECT_DIR$/static/js/common.js" />
|
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
+ <option value="$PROJECT_DIR$/static/js/common.js" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -224,12 +224,12 @@
|
|
|
<workItem from="1525013350506" duration="115000" />
|
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
|
<workItem from="1525181078381" duration="610000" />
|
|
|
- <workItem from="1525227575525" duration="8122000" />
|
|
|
+ <workItem from="1525227575525" duration="8228000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="12952000" />
|
|
|
+ <option name="totallyTimeSpent" value="13058000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -272,7 +272,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="1525272217914" expanded="true" signature="18744:18756" ph="..." />
|
|
|
+ <marker date="1525272246879" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -428,18 +428,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="491">
|
|
|
- <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$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="446">
|
| xqd
@@ -448,26 +436,38 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/static/js/common.js">
|
|
|
+ <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="221">
|
|
|
- <caret line="1204" column="27" lean-forward="false" selection-start-line="1204" selection-start-column="27" selection-end-line="1204" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="550">
|
|
|
+ <caret line="17" column="81" lean-forward="true" selection-start-line="17" selection-start-column="81" selection-end-line="17" selection-end-column="81" />
|
|
|
<folding>
|
|
|
- <marker date="1525272208397" expanded="true" signature="32210:32216" ph=" " />
|
|
|
- <marker date="1525272208397" expanded="true" signature="32216:32222" ph=" " />
|
|
|
- <marker date="1525272208397" expanded="true" signature="36377:36383" ph=" " />
|
|
|
- <marker date="1525272208397" expanded="true" signature="36383:36389" ph=" " />
|
|
|
- <marker date="1525272208397" expanded="true" signature="41694:41700" ph="..." />
|
|
|
+ <marker date="1525272246879" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="491">
|
|
|
+ <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$/static/js/common.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="581">
|
|
|
- <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
|
|
|
+ <state relative-caret-position="283">
|
|
|
+ <caret line="1209" column="49" lean-forward="true" selection-start-line="1209" selection-start-column="49" selection-end-line="1209" selection-end-column="49" />
|
|
|
<folding>
|
|
|
- <marker date="1525272217914" expanded="true" signature="18744:18756" ph="..." />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="32210:32216" ph=" " />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="32216:32222" ph=" " />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="36361:36367" ph=" " />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="36367:36373" ph=" " />
|
|
|
+ <marker date="1525272320958" expanded="true" signature="41678:41684" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|