|
| 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$/data/template/3_3_common_header.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_3_common_header.tpl.php" />
|
|
|
<change beforePath="$PROJECT_DIR$/data/template/3_diy_portal_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_portal_index.tpl.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
| xqd
@@ -18,7 +17,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/portal.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="605">
|
|
|
- <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
|
|
|
+ <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
| xqd
@@ -38,7 +37,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="694">
|
|
|
- <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
|
|
|
+ <caret line="29" column="1" lean-forward="false" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
| xqd
@@ -47,8 +46,8 @@
|
|
|
<file leaf-file-name="3_diy_portal_index.tpl.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_index.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="558">
|
|
|
- <caret line="17" column="32" lean-forward="false" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="496">
|
|
|
+ <caret line="20" column="75" lean-forward="false" selection-start-line="20" selection-start-column="75" selection-end-line="20" selection-end-column="75" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
| xqd
@@ -58,7 +57,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>group_recommend</find>
|
|
|
<find>$cachelist</find>
|
|
|
<find>$sgid</find>
|
|
|
<find>cachelist</find>
|
|
| xqd
@@ -88,6 +86,7 @@
|
|
|
<find>upload_icon_banner</find>
|
|
|
<find>加入方式</find>
|
|
|
<find>wk_logo</find>
|
|
|
+ <find>banner31</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
| xqd
@@ -237,12 +236,12 @@
|
|
|
<workItem from="1525788960861" duration="7945000" />
|
|
|
<workItem from="1525826298814" duration="3088000" />
|
|
|
<workItem from="1525928003267" duration="7000" />
|
|
|
- <workItem from="1526220063543" duration="2526000" />
|
|
|
+ <workItem from="1526220063543" duration="3215000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="72125000" />
|
|
|
+ <option name="totallyTimeSpent" value="72814000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
| xqd
@@ -635,7 +634,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/portal.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="605">
|
|
|
- <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
|
|
|
+ <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
| xqd
@@ -651,15 +650,15 @@
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="694">
|
|
|
- <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
|
|
|
+ <caret line="29" column="1" lean-forward="false" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_index.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="558">
|
|
|
- <caret line="17" column="32" lean-forward="false" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="496">
|
|
|
+ <caret line="20" column="75" lean-forward="false" selection-start-line="20" selection-start-column="75" selection-end-line="20" selection-end-column="75" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|