| xqd
@@ -2,7 +2,6 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<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" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
| xqd
@@ -17,8 +16,8 @@
|
|
|
<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">
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="422">
|
|
|
+ <caret line="199" column="0" lean-forward="false" selection-start-line="199" selection-start-column="0" selection-end-line="209" selection-end-column="7" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -61,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="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" />
|
|
|
+ <state relative-caret-position="326">
|
|
|
+ <caret line="1399" column="0" lean-forward="true" selection-start-line="1399" selection-start-column="0" selection-end-line="1399" selection-end-column="0" />
|
|
|
<folding>
|
|
|
- <marker date="1525270091617" expanded="true" signature="18737:18749" ph="..." />
|
|
|
+ <marker date="1525270244625" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -85,10 +84,10 @@
|
|
|
<find>create</find>
|
|
|
<find>$parentid</find>
|
|
|
<find>print_r</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>
|
|
|
+ <find>$groupnav</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
| xqd
@@ -203,12 +202,12 @@
|
|
|
<workItem from="1525013350506" duration="115000" />
|
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
|
<workItem from="1525181078381" duration="610000" />
|
|
|
- <workItem from="1525227575525" duration="6009000" />
|
|
|
+ <workItem from="1525227575525" duration="6164000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="10839000" />
|
|
|
+ <option name="totallyTimeSpent" value="10994000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -251,7 +250,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="1525270091617" expanded="true" signature="18737:18749" ph="..." />
|
|
|
+ <marker date="1525270244625" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -353,7 +352,7 @@
|
|
|
<state relative-caret-position="682">
|
|
|
<caret line="46" column="39" lean-forward="false" selection-start-line="46" selection-start-column="39" selection-end-line="46" selection-end-column="39" />
|
|
|
<folding>
|
|
|
- <element signature="e#7#191#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#7#191#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -412,18 +411,18 @@
|
|
|
</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" />
|
|
|
+ <state relative-caret-position="422">
|
|
|
+ <caret line="199" column="0" lean-forward="false" selection-start-line="199" selection-start-column="0" selection-end-line="209" selection-end-column="7" />
|
|
|
<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="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" />
|
|
|
+ <state relative-caret-position="326">
|
|
|
+ <caret line="1399" column="0" lean-forward="true" selection-start-line="1399" selection-start-column="0" selection-end-line="1399" selection-end-column="0" />
|
|
|
<folding>
|
|
|
- <marker date="1525270091617" expanded="true" signature="18737:18749" ph="..." />
|
|
|
+ <marker date="1525270244625" expanded="true" signature="18737:18749" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|