|
@@ -2,7 +2,7 @@
|
|
<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$/data/template/3_diy_group_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/source/module/group/group_index.php" afterPath="$PROJECT_DIR$/source/module/group/group_index.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" />
|
|
@@ -23,17 +23,17 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <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="true">
|
|
<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="698">
|
|
|
|
- <caret line="147" column="41" lean-forward="false" selection-start-line="147" selection-start-column="41" selection-end-line="147" selection-end-column="41" />
|
|
|
|
|
|
+ <state relative-caret-position="667">
|
|
|
|
+ <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="3_diy_group_index.tpl.php" pinned="false" current-in-tab="true">
|
|
|
|
|
|
+ <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="155">
|
|
<state relative-caret-position="155">
|
|
@@ -51,8 +51,8 @@
|
|
<component name="IdeDocumentHistory">
|
|
<component name="IdeDocumentHistory">
|
|
<option name="CHANGED_PATHS">
|
|
<option name="CHANGED_PATHS">
|
|
<list>
|
|
<list>
|
|
- <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -131,12 +131,12 @@
|
|
<option name="presentableId" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1525013349427</updated>
|
|
<updated>1525013349427</updated>
|
|
<workItem from="1525013350506" duration="115000" />
|
|
<workItem from="1525013350506" duration="115000" />
|
|
- <workItem from="1525013490770" duration="291000" />
|
|
|
|
|
|
+ <workItem from="1525013490770" duration="309000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="406000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="424000" />
|
|
</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" />
|
|
@@ -182,18 +182,18 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/source/module/group/group_index.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="698">
|
|
|
|
- <caret line="147" column="41" lean-forward="false" selection-start-line="147" selection-start-column="41" selection-end-line="147" selection-end-column="41" />
|
|
|
|
|
|
+ <state relative-caret-position="155">
|
|
|
|
+ <caret line="59" column="46" lean-forward="false" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
|
|
<folding />
|
|
<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$/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="155">
|
|
|
|
- <caret line="59" column="46" lean-forward="false" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
|
|
|
|
|
|
+ <state relative-caret-position="667">
|
|
|
|
+ <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>
|