test

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <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" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -23,14 +24,12 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_3_common_header.tpl.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="3_3_common_header.tpl.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="260">
-              <caret line="45" column="23" lean-forward="true" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
-              <folding>
-                <element signature="n#style#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="229">
+              <caret line="44" column="7" lean-forward="false" selection-start-line="44" selection-start-column="7" selection-end-line="44" selection-end-column="7" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -45,11 +44,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_portal_index.tpl.php" pinned="false" current-in-tab="false">
+      <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="31">
-              <caret line="1" column="66" lean-forward="false" selection-start-line="1" selection-start-column="41" selection-end-line="1" selection-end-column="66" />
+            <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" />
               <folding />
             </state>
           </provider>
@@ -59,7 +58,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>ct2 wp cl week_ct2</find>
       <find>group_recommend</find>
       <find>$cachelist</find>
       <find>$sgid</find>
@@ -89,6 +87,7 @@
       <find>名称</find>
       <find>upload_icon_banner</find>
       <find>加入方式</find>
+      <find>wk_logo</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -135,6 +134,7 @@
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/portal.php" />
         <option value="$PROJECT_DIR$/data/template/3_3_common_header.tpl.php" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_portal_index.tpl.php" />
       </list>
     </option>
   </component>
@@ -237,12 +237,12 @@
       <workItem from="1525788960861" duration="7945000" />
       <workItem from="1525826298814" duration="3088000" />
       <workItem from="1525928003267" duration="7000" />
-      <workItem from="1526220063543" duration="2428000" />
+      <workItem from="1526220063543" duration="2526000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="72027000" />
+    <option name="totallyTimeSpent" value="72125000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -632,37 +632,35 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.php">
+    <entry file="file://$PROJECT_DIR$/portal.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" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_index.tpl.php">
+    <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="31">
-          <caret line="1" column="66" lean-forward="false" selection-start-line="1" selection-start-column="41" selection-end-line="1" selection-end-column="66" />
+        <state relative-caret-position="229">
+          <caret line="44" column="7" lean-forward="false" selection-start-line="44" selection-start-column="7" selection-end-line="44" selection-end-column="7" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/portal.php">
+    <entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.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" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header.tpl.php">
+    <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="260">
-          <caret line="45" column="23" lean-forward="true" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
-          <folding>
-            <element signature="n#style#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+        <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" />
+          <folding />
         </state>
       </provider>
     </entry>

data/template/3_3_common_header.tpl.php

@@ -43,12 +43,7 @@
         <link rel="stylesheet" type="text/css" id="diy_common" href="<?php echo $_G['setting']['csspath'];?><?php echo STYLEID;?>_css_diy.css?<?php echo VERHASH;?>" />
     <?php } ?>
 </head>
-<style type="text/css">
-    .wk_logo img {
-        height: 45px !important;
-    }
-</style>
-<body style="background-color: red" id="nv_<?php echo $_G['basescript'];?>" class="pg_<?php echo CURMODULE;?><?php if($_G['basescript'] === 'portal' && CURMODULE === 'list' && !empty($cat)) { ?> <?php echo $cat['bodycss'];?><?php } ?>" onkeydown="if(event.keyCode==27) return false;" >
+<body id="nv_<?php echo $_G['basescript'];?>" class="pg_<?php echo CURMODULE;?><?php if($_G['basescript'] === 'portal' && CURMODULE === 'list' && !empty($cat)) { ?> <?php echo $cat['bodycss'];?><?php } ?>" onkeydown="if(event.keyCode==27) return false;" >
 <div id="append_parent"></div><div id="ajaxwaitid"></div>
 <?php if($_GET['diy'] == 'yes' && check_diy_perm($topic)) { include template('common/header_diy'); } if(check_diy_perm($topic)) { include template('common/header_diynav'); } if(CURMODULE == 'topic' && $topic && empty($topic['useheader']) && check_diy_perm($topic)) { ?>
     <?php echo $diynav;?>

data/template/3_diy_portal_index.tpl.php

@@ -13,7 +13,11 @@ tabId:"#wk_about_menu",tabTag:"a",conId:"#wk_about_div",conTag:"div.wk_aaa",act:
 });
 });
 </script>
-
+<style>
+    .wk_logo img {
+        height: 45px !important;
+    }
+</style>
 </div>
 <div class="clear"></div>