test

.idea/workspace.xml

@@ -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$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.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" />
@@ -13,7 +13,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="353">
@@ -87,13 +87,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="25978">
-              <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
+            <state relative-caret-position="811">
+              <caret line="920" column="37" lean-forward="false" selection-start-line="920" selection-start-column="37" selection-end-line="920" selection-end-column="37" />
               <folding>
-                <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
+                <marker date="1525659133384" expanded="true" signature="18891:18903" ph="..." />
               </folding>
             </state>
           </provider>
@@ -149,7 +149,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>groupnamecheck</find>
       <find>$jointype</find>
       <find>上传</find>
       <find>推荐</find>
@@ -179,6 +178,7 @@
       <find>checkgroupname</find>
       <find>print_r</find>
       <find>upload_icon_banner</find>
+      <find>所属分类</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -203,9 +203,9 @@
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/config/config_ucenter.php" />
-        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/source/function/function_forum.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       </list>
     </option>
   </component>
@@ -313,12 +313,12 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="558000" />
+      <workItem from="1525658293907" duration="957000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="26432000" />
+    <option name="totallyTimeSpent" value="26831000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -361,7 +361,7 @@
         <state relative-caret-position="25978">
           <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
           <folding>
-            <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525659133384" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -458,7 +458,7 @@
         <state relative-caret-position="43679">
           <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="1525623229992" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525659133384" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -517,7 +517,7 @@
         <state relative-caret-position="43679">
           <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="1525623229992" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525659133384" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -527,7 +527,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="1525623229992" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525659133384" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -628,6 +628,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="692">
           <caret line="38" column="212" lean-forward="false" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="212" />
+          <folding>
+            <element signature="n#!!doc" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -698,14 +701,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2635">
@@ -718,16 +713,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="25978">
-          <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
-          <folding>
-            <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4309">
@@ -796,6 +781,14 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="353">
@@ -804,5 +797,15 @@
         </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="811">
+          <caret line="920" column="37" lean-forward="false" selection-start-line="920" selection-start-column="37" selection-end-line="920" selection-end-column="37" />
+          <folding>
+            <marker date="1525659133384" expanded="true" signature="18891:18903" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

data/template/3_diy_group_group.tpl.php

@@ -894,17 +894,29 @@ EOF;
                             </tr>
                             <?php if(!empty($specialswitch['allowchangename']) && ($_G['uid'] == $_G['forum']['founderuid'] || $_G['adminid'] == 1)) { ?>
                                 <tr>
-                                    <th><span class="rq">*</span><?php echo $_G['setting']['navs']['3']['navname'];?>名称:</th>
+                                    <th><span class="rq">*</span><?php echo $_G['setting']['navs']['3']['navname'];?>名称</th>
                                     <td><input type="text" id="name" name="name" class="px" size="36" tabindex="1" value="<?php echo $_G['forum']['name'];?>" autocomplete="off" tabindex="1" /></td>
                                 </tr>
                             <?php } if(!empty($specialswitch['allowchangetype']) && ($_G['uid'] == $_G['forum']['founderuid'] || $_G['adminid'] == 1)) { ?>
+<!--                                <tr>-->
+<!--                                    <th><span class="rq">*</span>所属分类</th>-->
+<!--                                    <td>-->
+<!--                                        <select name="parentid" tabindex="2" class="ps" onchange="ajaxget('forum.php?mod=ajax&action=secondgroup&fupid='+ this.value, 'secondgroup');">-->
+<!--                                            --><?php //echo $groupselect['first'];?>
+<!--                                        </select>-->
+<!--                                        <em id="secondgroup">--><?php //if($groupselect['second']) { ?><!--<select id="fup" name="fup" class="ps" >--><?php //echo $groupselect['second'];?><!--</select>--><?php //} ?><!--</em>-->
+<!--                                    </td>-->
+<!--                                </tr>-->
                                 <tr>
-                                    <th><span class="rq">*</span>所属分类:</th>
+                                    <th><strong class="rq y">*</strong>所属地区</th>
                                     <td>
-                                        <select name="parentid" tabindex="2" class="ps" onchange="ajaxget('forum.php?mod=ajax&action=secondgroup&fupid='+ this.value, 'secondgroup');">
-                                            <?php echo $groupselect['first'];?>
-                                        </select>
-                                        <em id="secondgroup"><?php if($groupselect['second']) { ?><select id="fup" name="fup" class="ps" ><?php echo $groupselect['second'];?></select><?php } ?></em>
+                                        <select id="s_province" name="province"></select>  
+
+                                        <select id="s_city" name="city" ></select>  
+
+                                        <select id="s_county" name="county"></select>
+                                        <em id="secondgroup"></em>
+                                        <span id="groupcategorycheck" class="xi1"></span>
                                     </td>
                                 </tr>
                             <?php } ?>