|
@@ -2,8 +2,8 @@
|
|
<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$/index.php" afterPath="$PROJECT_DIR$/index.php" />
|
|
<change beforePath="$PROJECT_DIR$/template/default/forum/discuz.htm" afterPath="$PROJECT_DIR$/template/default/forum/discuz.htm" />
|
|
<change beforePath="$PROJECT_DIR$/template/default/forum/discuz.htm" afterPath="$PROJECT_DIR$/template/default/forum/discuz.htm" />
|
|
- <change beforePath="$PROJECT_DIR$/template/wfdsoft_jiaohu/forum/discuz.php" afterPath="$PROJECT_DIR$/template/wfdsoft_jiaohu/forum/discuz.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" />
|
|
@@ -14,41 +14,21 @@
|
|
</component>
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
|
|
- <file leaf-file-name="discuz.htm" pinned="false" current-in-tab="true">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/template/default/forum/discuz.htm">
|
|
|
|
|
|
+ <file leaf-file-name="header.htm" pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/template/default/common/header.htm">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="31">
|
|
|
|
- <caret line="1" column="28" lean-forward="false" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
|
|
|
|
|
|
+ <state relative-caret-position="-1023">
|
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
|
|
|
+ <file leaf-file-name="index.php" pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/index.php">
|
|
<entry file="file://$PROJECT_DIR$/index.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="31">
|
|
<state relative-caret-position="31">
|
|
- <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
|
|
|
|
- <folding />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file leaf-file-name="index.htm" pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/index.htm">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="0">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
- <folding />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file leaf-file-name="index.htm" pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/data/threadcache/index.htm">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="0">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
|
|
+ <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -124,9 +104,9 @@
|
|
<option value="$PROJECT_DIR$/forum.php" />
|
|
<option value="$PROJECT_DIR$/forum.php" />
|
|
<option value="$PROJECT_DIR$/home.php" />
|
|
<option value="$PROJECT_DIR$/home.php" />
|
|
<option value="$PROJECT_DIR$/misc.php" />
|
|
<option value="$PROJECT_DIR$/misc.php" />
|
|
- <option value="$PROJECT_DIR$/index.php" />
|
|
|
|
<option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/forum/discuz.php" />
|
|
<option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/forum/discuz.php" />
|
|
<option value="$PROJECT_DIR$/template/default/forum/discuz.htm" />
|
|
<option value="$PROJECT_DIR$/template/default/forum/discuz.htm" />
|
|
|
|
+ <option value="$PROJECT_DIR$/index.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -180,13 +160,6 @@
|
|
<item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="default" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="default" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
</path>
|
|
</path>
|
|
- <path>
|
|
|
|
- <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="default" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="forum" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- </path>
|
|
|
|
<path>
|
|
<path>
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
@@ -249,12 +222,12 @@
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
<workItem from="1525275777043" duration="4000" />
|
|
<workItem from="1525275777043" duration="4000" />
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
- <workItem from="1525658293907" duration="20830000" />
|
|
|
|
|
|
+ <workItem from="1525658293907" duration="21312000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="46704000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="47186000" />
|
|
</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" />
|
|
@@ -292,13 +265,6 @@
|
|
<watches-manager />
|
|
<watches-manager />
|
|
</component>
|
|
</component>
|
|
<component name="editorHistoryManager">
|
|
<component name="editorHistoryManager">
|
|
- <entry file="file://$PROJECT_DIR$/static/js/common.js">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="853">
|
|
|
|
- <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/template/default/group/area.htm">
|
|
<entry file="file://$PROJECT_DIR$/template/default/group/area.htm">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<state relative-caret-position="0">
|
|
@@ -894,15 +860,15 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/index.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/index.htm">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="31">
|
|
|
|
- <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
|
|
|
|
|
|
+ <state relative-caret-position="0">
|
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/data/template/index.htm">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/discuzx_utility.lock">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
@@ -910,26 +876,26 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/index.htm">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/forum/discuz.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="0">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
|
|
+ <state relative-caret-position="217">
|
|
|
|
+ <caret line="6" column="21" lean-forward="true" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/data/discuzx_utility.lock">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/template/default/forum/discuz.htm">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="0">
|
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
|
|
+ <state relative-caret-position="31">
|
|
|
|
+ <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/forum/discuz.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/index.htm">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="217">
|
|
|
|
- <caret line="6" column="21" lean-forward="true" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
|
|
|
|
|
|
+ <state relative-caret-position="0">
|
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -942,10 +908,18 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/template/default/forum/discuz.htm">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/template/default/common/header.htm">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="-1023">
|
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/index.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="31">
|
|
<state relative-caret-position="31">
|
|
- <caret line="1" column="28" lean-forward="false" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
|
|
|
|
|
|
+ <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|