Merge branch 'master' of https://gitea.softopia.gku.ac.jp/kitagata/kitagata

.idea/workspace.xml

@@ -25,35 +25,14 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-12450] HP更新依頼（障害計画公開）">
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_13.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_14.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_15.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_16.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_17.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_18.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_19.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_20.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_21.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_22.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calendar_of_living_2021_23.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_10.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_11.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_12.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_4.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_5.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_6.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_7.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_8.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2021_9.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2022_1.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2022_2.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/living/calender_of_living_2022_3.jpg" afterDir="false" />
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-12449] HP更新依頼【都市環境課】くらしのカレンダー">
+      <change afterPath="$PROJECT_DIR$/fourth/lifeguide/garbage/images/creanrisaikuru2021.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fourth/lifeguide/garbage/images/gabage_rule2021.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fourth/lifeguide/garbage/pdf/creanrisaikuru2021.pdf" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fourth/lifeguide/garbage/pdf/gabage_rule2021.pdf" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/calender/Calender.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/calender/Calender.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/calender/Living.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/calender/Living.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/living/Adult_health.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/living/Adult_health.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/living/Maternal_and_child_health.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/living/Maternal_and_child_health.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/third/living/Recycling_Center.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/living/Recycling_Center.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/third/living/Waste_separation.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/living/Waste_separation.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -104,11 +83,11 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/fourth/lifeguide/garbage/images" />
+      <recent name="$PROJECT_DIR$/fourth/lifeguide/garbage/pdf" />
       <recent name="$PROJECT_DIR$/css/pdf/living" />
       <recent name="$PROJECT_DIR$/fourth/lifeguide/welfare/pdf" />
-      <recent name="$PROJECT_DIR$/fourth/lifeguide/garbage/pdf" />
       <recent name="C:\Users\softopia\kitagata\kitagata\fourth\topics\pdf" />
-      <recent name="C:\Users\softopia\kitagata\kitagata\fourth\education\pdf" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/third/Public_transport" />
@@ -154,7 +133,7 @@
       <workItem from="1617076574908" duration="2360000" />
       <workItem from="1617756784518" duration="610000" />
       <workItem from="1617774327554" duration="190000" />
-      <workItem from="1617774610983" duration="5126000" />
+      <workItem from="1617774610983" duration="7224000" />
     </task>
     <task id="LOCAL-00001" summary="[kitagata_support-09561] HP更新　申請書書式修正（税務課）">
       <created>1569421229164</created>
@@ -247,7 +226,14 @@
       <option name="project" value="LOCAL" />
       <updated>1617776439758</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="[kitagata_support-12449] HP更新依頼【都市環境課】くらしのカレンダー">
+      <created>1617779758786</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1617779758786</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -278,13 +264,14 @@
     <MESSAGE value="[kitagata_support-12371] HP更新依頼(アユカ）途中　あと運転免許証を自主返納された方への支援についてのページ" />
     <MESSAGE value="[kitagata_support-12446] HP更新依頼【都市環境課】廃棄物処理実施計画" />
     <MESSAGE value="[kitagata_support-12450] HP更新依頼（障害計画公開）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-12450] HP更新依頼（障害計画公開）" />
+    <MESSAGE value="[kitagata_support-12449] HP更新依頼【都市環境課】くらしのカレンダー" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-12449] HP更新依頼【都市環境課】くらしのカレンダー" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="240" y="467" key="Vcs.Push.Dialog.v2" timestamp="1617776444581">
+    <state x="240" y="467" key="Vcs.Push.Dialog.v2" timestamp="1617779762792">
       <screen x="0" y="23" width="2560" height="1417" />
     </state>
-    <state x="240" y="467" key="Vcs.Push.Dialog.v2/0.23.2560.1417@0.23.2560.1417" timestamp="1617776444581" />
+    <state x="240" y="467" key="Vcs.Push.Dialog.v2/0.23.2560.1417@0.23.2560.1417" timestamp="1617779762792" />
     <state x="453" y="648" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1617776394345">
       <screen x="0" y="23" width="2560" height="1417" />
     </state>
@@ -297,10 +284,10 @@
       <screen x="0" y="23" width="2560" height="1417" />
     </state>
     <state x="234" y="109" width="940" height="1398" key="dock-window-2/0.23.2560.1417@0.23.2560.1417" timestamp="1616569436395" />
-    <state x="450" y="286" width="670" height="676" key="search.everywhere.popup" timestamp="1617779495493">
+    <state x="450" y="286" width="670" height="676" key="search.everywhere.popup" timestamp="1617780341174">
       <screen x="0" y="23" width="2560" height="1417" />
     </state>
-    <state x="450" y="286" width="670" height="676" key="search.everywhere.popup/0.23.2560.1417@0.23.2560.1417" timestamp="1617779495493" />
+    <state x="450" y="286" width="670" height="676" key="search.everywhere.popup/0.23.2560.1417@0.23.2560.1417" timestamp="1617780341174" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/kitagata$.dat" NAME="更新用 Coverage Results" MODIFIED="1569418362637" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="WipCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />

third/living/Recycling_Center.html

@@ -142,8 +142,8 @@
             </div>
           </div>
           <span id="template_article_block">
-            <p class="paragraphT10"> <a href="../../fourth/lifeguide/garbage/pdf/creanrisaikuru2020.pdf"
-                target="_blank"><img src="../../fourth/lifeguide/garbage/images/creanrisaikuru2020.png"
+            <p class="paragraphT10"> <a href="../../fourth/lifeguide/garbage/pdf/creanrisaikuru2021.pdf"
+                target="_blank"><img src="../../fourth/lifeguide/garbage/images/creanrisaikuru2021.png"
                   alt="クリーンリサイクルの日" width="200" id="left" /></a><br />
               <a href="../../fourth/lifeguide/garbage/pdf/creanrisaikuru2020.pdf"
                 target="_blank">詳しくはPDF「クリーンリサイクルの日(PDF
@@ -224,4 +224,4 @@
     width="1" />
 </body>
 
-</html>
+</html>

third/living/Waste_separation.html

@@ -141,8 +141,8 @@
           </div>
           <span id="template_article_block">
             <p class="paragraphT10">
-              <a href="../../fourth/lifeguide/garbage/pdf/gabage_rule2020.pdf" target="_blank"><img
-                  src="../../fourth/lifeguide/garbage/images/gabage_rule2020.png" alt="ごみの出し方案内" width="200"
+              <a href="../../fourth/lifeguide/garbage/pdf/gabage_rule2021.pdf" target="_blank"><img
+                  src="../../fourth/lifeguide/garbage/images/gabage_rule2021.png" alt="ごみの出し方案内" width="200"
                   height="293" id="left" /></a></p><br />
             <a href="../../fourth/lifeguide/garbage/pdf/gabage_rule2020.pdf" target="_blank">詳しくはPDF「ごみの出し方案内(PDF
               約1.1MB)」をご覧ください。</a>&emsp;
@@ -184,4 +184,4 @@
     width="1" />
 </body>
 
-</html>
+</html>