| xqd
@@ -2,7 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<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$/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" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
| xqd
@@ -13,11 +13,11 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf>
|
|
|
- <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">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="264">
|
|
|
- <caret line="201" column="26" lean-forward="false" selection-start-line="201" selection-start-column="26" selection-end-line="201" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="248">
|
|
|
+ <caret line="8" column="13" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -57,13 +57,13 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
|
|
|
+ <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="570">
|
|
|
- <caret line="58" column="18" lean-forward="false" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
|
|
|
+ <state relative-caret-position="873">
|
|
|
+ <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
|
|
|
<folding>
|
|
|
- <marker date="1525273083318" expanded="true" signature="18656:18668" ph="..." />
|
|
|
+ <marker date="1525274562021" expanded="true" signature="18830:18842" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -117,8 +117,8 @@
|
|
|
<find>fwin_a_favorite</find>
|
|
|
<find>append_parent</find>
|
|
|
<find>$groupnav</find>
|
|
|
- <find>ct2 wp cl week_ct2</find>
|
|
|
<find>common.js</find>
|
|
|
+ <find>ct2 wp cl week_ct2</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
| xqd
@@ -136,9 +136,9 @@
|
|
|
<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$/data/template/3_3_common_header_no_nav.tpl.php" />
|
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
|
|
|
+ <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -235,12 +235,12 @@
|
|
|
<workItem from="1525013350506" duration="115000" />
|
|
|
<workItem from="1525013490770" duration="4105000" />
|
|
|
<workItem from="1525181078381" duration="610000" />
|
|
|
- <workItem from="1525227575525" duration="10389000" />
|
|
|
+ <workItem from="1525227575525" duration="10462000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="15219000" />
|
|
|
+ <option name="totallyTimeSpent" value="15292000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -283,7 +283,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="1525273083318" expanded="true" signature="18656:18668" ph="..." />
|
|
|
+ <marker date="1525274562021" expanded="true" signature="18830:18842" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -435,16 +435,6 @@
|
|
|
</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="570">
|
|
|
- <caret line="58" column="18" lean-forward="false" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
|
|
|
- <folding>
|
|
|
- <marker date="1525273083318" expanded="true" signature="18656:18668" 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="37882">
|
| xqd
@@ -485,11 +475,21 @@
|
|
|
</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="264">
|
|
|
- <caret line="201" column="26" lean-forward="false" selection-start-line="201" selection-start-column="26" selection-end-line="201" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="248">
|
|
|
+ <caret line="8" column="13" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
|
|
|
<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="873">
|
|
|
+ <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525274562021" expanded="true" signature="18830:18842" ph="..." />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
</project>
|