|
@@ -2,7 +2,8 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="b6faea92-a65d-441a-9752-2f40c137a7e3" name="Default" comment="">
|
|
<list default="true" id="b6faea92-a65d-441a-9752-2f40c137a7e3" name="Default" comment="">
|
|
- <change beforePath="$PROJECT_DIR$/source/module/group/group_index.php" afterPath="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
|
|
|
|
+ <change beforePath="" afterPath="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.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,21 +24,11 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="group_index.php" pinned="false" current-in-tab="true">
|
|
|
|
|
|
+ <file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
|
|
<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="419">
|
|
<state relative-caret-position="419">
|
|
- <caret line="148" column="42" lean-forward="false" selection-start-line="148" selection-start-column="42" selection-end-line="148" selection-end-column="42" />
|
|
|
|
- <folding />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file leaf-file-name="header.php" pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header.php">
|
|
|
|
- <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="148" column="44" lean-forward="false" selection-start-line="148" selection-start-column="12" selection-end-line="148" selection-end-column="44" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -66,11 +57,21 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="false">
|
|
|
|
|
|
+ <file leaf-file-name="3_3_common_header_no_nav.tpl.php" pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="564">
|
|
|
|
+ <caret line="83" column="0" lean-forward="false" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="true">
|
|
<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="31">
|
|
|
|
- <caret line="1" column="39" lean-forward="true" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="39" />
|
|
|
|
|
|
+ <state relative-caret-position="124">
|
|
|
|
+ <caret line="4" column="15" lean-forward="true" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -94,9 +95,10 @@
|
|
<option value="$PROJECT_DIR$/source/module/portal/portal_index.php" />
|
|
<option value="$PROJECT_DIR$/source/module/portal/portal_index.php" />
|
|
<option value="$PROJECT_DIR$/admin.php" />
|
|
<option value="$PROJECT_DIR$/admin.php" />
|
|
<option value="$PROJECT_DIR$/source/admincp/admincp_login.php" />
|
|
<option value="$PROJECT_DIR$/source/admincp/admincp_login.php" />
|
|
- <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
|
|
|
|
<option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header_no_nav.php" />
|
|
<option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header_no_nav.php" />
|
|
<option value="$PROJECT_DIR$/source/module/group/group_index.php" />
|
|
<option value="$PROJECT_DIR$/source/module/group/group_index.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" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -199,6 +201,7 @@
|
|
</component>
|
|
</component>
|
|
<component name="RecentsManager">
|
|
<component name="RecentsManager">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
|
+ <recent name="D:\wamp64\www\Project\zijia\data\template" />
|
|
<recent name="D:\wamp64\www\Project\zijia\template\wfdsoft_jiaohu\common" />
|
|
<recent name="D:\wamp64\www\Project\zijia\template\wfdsoft_jiaohu\common" />
|
|
</key>
|
|
</key>
|
|
</component>
|
|
</component>
|
|
@@ -237,12 +240,12 @@
|
|
<workItem from="1524101424073" duration="15000" />
|
|
<workItem from="1524101424073" duration="15000" />
|
|
<workItem from="1524727323225" duration="1868000" />
|
|
<workItem from="1524727323225" duration="1868000" />
|
|
<workItem from="1524830861798" duration="5000" />
|
|
<workItem from="1524830861798" duration="5000" />
|
|
- <workItem from="1524881363592" duration="1255000" />
|
|
|
|
|
|
+ <workItem from="1524881363592" duration="1390000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="20742000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="20877000" />
|
|
</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" />
|
|
@@ -280,11 +283,6 @@
|
|
<watches-manager />
|
|
<watches-manager />
|
|
</component>
|
|
</component>
|
|
<component name="editorHistoryManager">
|
|
<component name="editorHistoryManager">
|
|
- <entry file="file://$PROJECT_DIR$/favicon.ico">
|
|
|
|
- <provider selected="true" editor-type-id="images">
|
|
|
|
- <state />
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/template/default/portal/portalcp_block_thumbsetting.htm">
|
|
<entry file="file://$PROJECT_DIR$/template/default/portal/portalcp_block_thumbsetting.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">
|
|
@@ -580,14 +578,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</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="31">
|
|
|
|
- <caret line="1" column="39" lean-forward="true" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="39" />
|
|
|
|
- <folding />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_list_17.tpl.php">
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_list_17.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="589">
|
|
<state relative-caret-position="589">
|
|
@@ -604,6 +594,17 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="305">
|
|
|
|
+ <caret line="518" column="9" lean-forward="false" selection-start-line="518" selection-start-column="9" selection-end-line="518" selection-end-column="9" />
|
|
|
|
+ <folding>
|
|
|
|
+ <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
|
+ <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_group_index.tpl.php">
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_group_index.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-6649">
|
|
<state relative-caret-position="-6649">
|
|
@@ -612,14 +613,11 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="305">
|
|
|
|
- <caret line="518" column="9" lean-forward="false" selection-start-line="518" selection-start-column="9" selection-end-line="518" selection-end-column="9" />
|
|
|
|
- <folding>
|
|
|
|
- <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
|
- <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
|
- </folding>
|
|
|
|
|
|
+ <state relative-caret-position="564">
|
|
|
|
+ <caret line="83" column="0" lean-forward="false" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
|
|
|
|
+ <folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -634,7 +632,15 @@
|
|
<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="419">
|
|
<state relative-caret-position="419">
|
|
- <caret line="148" column="42" lean-forward="false" selection-start-line="148" selection-start-column="42" selection-end-line="148" selection-end-column="42" />
|
|
|
|
|
|
+ <caret line="148" column="44" lean-forward="false" selection-start-line="148" selection-start-column="12" selection-end-line="148" selection-end-column="44" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </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="124">
|
|
|
|
+ <caret line="4" column="15" lean-forward="true" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|