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

.idea/workspace.xml

@@ -25,12 +25,11 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-12632] ホームページ更新依頼（町の人口）">
-      <change afterPath="$PROJECT_DIR$/fourth/administrative/images/zaisei/sainyuu_2021.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/administrative/images/zaisei/saisyutu_2021.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/budget_summary/R03_Budget_summary.html" afterDir="false" />
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-12633] 【HP更新依頼】令和3年度予算概要">
+      <change afterPath="$PROJECT_DIR$/fourth/administrative/images/zaisei/2021_juuminyosan.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fourth/administrative/pdf/zaisei/2021_juuminyosan.pdf" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/town_admini_info/Budget_summary.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/town_admini_info/Budget_summary.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fourth/town_admini_info/budget_summary/R03_Budget_summary.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/town_admini_info/budget_summary/R03_Budget_summary.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -96,10 +95,10 @@
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/fourth/administrative/images/zaisei" />
+      <recent name="$PROJECT_DIR$/fourth/administrative/pdf/zaisei" />
       <recent name="$PROJECT_DIR$/fourth/lifeguide/tax/pdf" />
       <recent name="$PROJECT_DIR$/css/pdf/tax" />
       <recent name="$PROJECT_DIR$/third/Coronavirus" />
-      <recent name="$PROJECT_DIR$/fourth/agriculture/pdf" />
     </key>
   </component>
   <component name="RunManager">
@@ -168,14 +167,8 @@
       <workItem from="1620729093153" duration="5108000" />
       <workItem from="1620780116170" duration="7045000" />
       <workItem from="1620871605800" duration="11817000" />
-      <workItem from="1620891504811" duration="1749000" />
-    </task>
-    <task id="LOCAL-00006" summary="[kitagata_support-09617] ホームページ更新依頼（ファイル差替）">
-      <created>1570634133301</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1570634133301</updated>
+      <workItem from="1620891504811" duration="1850000" />
+      <workItem from="1620953001260" duration="704000" />
     </task>
     <task id="LOCAL-00007" summary="[kitagata_support-12240] HP更新依頼（機構改革に伴うＨＰ更新依頼・４月１日更新）　総務課分を変更">
       <created>1616489628367</created>
@@ -513,7 +506,14 @@
       <option name="project" value="LOCAL" />
       <updated>1620879123491</updated>
     </task>
-    <option name="localTasksCounter" value="55" />
+    <task id="LOCAL-00055" summary="[kitagata_support-12633] 【HP更新依頼】令和3年度予算概要">
+      <created>1620893332045</created>
+      <option name="number" value="00055" />
+      <option name="presentableId" value="LOCAL-00055" />
+      <option name="project" value="LOCAL" />
+      <updated>1620893332045</updated>
+    </task>
+    <option name="localTasksCounter" value="56" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -560,7 +560,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="[kitagata_support-12507] HP更新依頼（ひとり親臨時給付金）" />
     <MESSAGE value="[kitagata_support-12521] HP更新依頼（公共施設総合管理計画）" />
     <MESSAGE value="[kitagata_support-12527] HP更新依頼（子ども館）" />
     <MESSAGE value="[kitagata_support-12528] Re- HP更新依頼（ひとり親臨時給付金）" />
@@ -585,7 +584,8 @@
     <MESSAGE value="Revert &quot;[kitagata_support-12602] HP追加依頼（新型コロナ　ワクチン接種について）0506&quot;&#10;&#10;This reverts commit d753938e" />
     <MESSAGE value="[kitagata_support-12630] 【HP更新依頼】押印廃止に係る各種様式・本文等修正" />
     <MESSAGE value="[kitagata_support-12632] ホームページ更新依頼（町の人口）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-12632] ホームページ更新依頼（町の人口）" />
+    <MESSAGE value="[kitagata_support-12633] 【HP更新依頼】令和3年度予算概要" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-12633] 【HP更新依頼】令和3年度予算概要" />
   </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" />

fourth/town_admini_info/budget_summary/R03_Budget_summary.html

@@ -218,14 +218,18 @@
                 <!--<div style="position: relative; width:198px; height:280px; border: 1px solid #333333;">
   <div style="position: absolute; width:50px; height:30px; top: 0; right: 0; bottom: 0; left: 0; margin: auto;">準備中</div>
   </div>-->
-              <img src="../../administrative/images/zaisei/2020jyuuminyosan.png" alt="令和2年度わかりやすい予算説明書" width="198"
+              <img src="../../administrative/images/zaisei/2021_juuminyosan.png" alt="令和2年度わかりやすい予算説明書" width="198"
                    height="280" id="left"/><br/>町が行う主な事業をより身近に感じてもらうために、通常の予算書ではわかりにくい事業の内容をできるだけわかりやすい言葉で説明しています。<br/>
-              <br/><a href="../../administrative/pdf/zaisei/2020jyuuminyosan.pdf">わかりやすい予算説明書(PDF3.2MB)</a>
+              <br/><a href="../../administrative/pdf/zaisei/2021_juuminyosan.pdf">わかりやすい予算説明書(PDF3.5MB)</a>
             </p>
           </span>
-                <p><strong id="life">令和２年度町長メッセージ（5月1日）</strong></p><br>
-                <iframe width="480" height="270" src="https://www.youtube.com/embed/0LZe0G_wRJg" frameborder="0"
-                        allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+                <p><strong id="life">令和３年度町長メッセージ（5月1日）</strong></p><br>
+                <!--                <iframe width="480" height="270" src="https://www.youtube.com/embed/0LZe0G_wRJg" frameborder="0"-->
+                <!--                        allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"-->
+                <!--                        allowfullscreen></iframe>-->
+                <iframe width="480" height="270" src="https://www.youtube.com/embed/QdrspZjEXyI"
+                        title="YouTube video player" frameborder="0"
+                        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                         allowfullscreen></iframe>
         </section>
     </div>