From 604b21c085fc64d32081c866ce16d1dc9ef35aef Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 8 Oct 2014 14:53:01 +0900 Subject: [PATCH 001/229] openspending.identifie hai --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index dcd8fd6d..a4d14c07 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'yokohama_budget'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2012'; OpenSpending.Styles = OpenSpending.Styles || {}; From 068255400113db7d8555cb9c0a91efdd618acd53 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 8 Oct 2014 14:56:35 +0900 Subject: [PATCH 002/229] cname kakogawa --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 9f8123c7..19b3becd 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -yokohama.spending.jp +kakogawa.spending.jp From d23a16925f423287670733f6e7afa52c73966d15 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 8 Oct 2014 15:08:51 +0900 Subject: [PATCH 003/229] kakogawajinzai --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 19b3becd..ac2c670a 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -kakogawa.spending.jp +kakogawajinzai.spending.jp From 1a3e3a4f8ed93ccbb6b60a69df50077df0f940b2 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 8 Oct 2014 15:37:43 +0900 Subject: [PATCH 004/229] yokohama --- js/setting.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index a4d14c07..5b27a53b 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'yokohama_budget'; OpenSpending.year = '2012'; OpenSpending.Styles = OpenSpending.Styles || {}; @@ -47,4 +47,3 @@ OpenSpending.Styles.Cofog = { '10-1': { icon: 'icons/order-safety.svg', color: '#C75746', bcolor: '#790586' } }; - From 050ae4302dd956eb52e5a668883d64e1ffa7b1ea Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 8 Oct 2014 16:04:02 +0900 Subject: [PATCH 005/229] kakogawa date --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 5b27a53b..f87e028d 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'yokohama_budget'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2012'; OpenSpending.Styles = OpenSpending.Styles || {}; From 6fbefbc52e077c3bc3b513daedb138f68d706d08 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 8 Oct 2014 16:16:31 +0900 Subject: [PATCH 006/229] year2014 --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index f87e028d..8594aabb 100644 --- a/js/setting.js +++ b/js/setting.js @@ -11,7 +11,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; OpenSpending.identifier = 'jinzai2012ikusei'; -OpenSpending.year = '2012'; +OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 555155d05f40b05e133897f6c39eeeef262cfa4d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 26 Nov 2014 14:25:01 +0900 Subject: [PATCH 007/229] aa aaaaa --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 3e86f234..ba771c1b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -28,7 +28,7 @@ {{ site.title }}
- あなたが横浜市に納めた税金がどこで使われているかをお示しします + あなたが加古川市に納めた税金がどこで使われているかをお示しします
From 46a08a0b44a1975e1ecd1258e9e60ce76b051174 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 26 Nov 2014 15:34:28 +0900 Subject: [PATCH 008/229] default.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あお --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index ba771c1b..3e86f234 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -28,7 +28,7 @@ {{ site.title }}
- あなたが加古川市に納めた税金がどこで使われているかをお示しします + あなたが横浜市に納めた税金がどこで使われているかをお示しします
From 42da0763cda9b9a6fa61d6f83feaae902cd0423e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 26 Nov 2014 15:45:06 +0900 Subject: [PATCH 009/229] year2014 q --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 8594aabb..5f654d10 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,8 +18,8 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '1': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, - '1-1': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, + '100': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, + '100-101': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, '2': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, '2-1': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, '2-2': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#0AB971' }, From 4c158f87880d8b910b11740c274e3a3c265aaf95 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 26 Nov 2014 15:50:52 +0900 Subject: [PATCH 010/229] year2014 kjoi --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 5f654d10..893fe551 100644 --- a/js/setting.js +++ b/js/setting.js @@ -20,8 +20,8 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, '100-101': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, - '2': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, - '2-1': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, + '200': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, + '200-201': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, '2-2': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#0AB971' }, '3': { icon: 'icons/economy-tourism.svg', color: '#C75746', bcolor: '#4E6D00' }, '3-1': { icon: 'icons/dollar.svg', color: '#C75746', bcolor: '#4E6D00' }, From 37a2ad5ef81a0fcc2522ac413eab0a5927803480 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 26 Nov 2014 15:52:37 +0900 Subject: [PATCH 011/229] year2014 u --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 893fe551..56abe0df 100644 --- a/js/setting.js +++ b/js/setting.js @@ -34,8 +34,8 @@ OpenSpending.Styles.Cofog = { '5': { icon: 'icons/environment.svg', color: '#C75746', bcolor: '#2A3A03' }, '5-1': { icon: 'icons/tree.svg', color: '#C75746', bcolor: '#2A3A03' }, '5-2': { icon: 'icons/wind.svg', color: '#C75746', bcolor: '#2A3A03' }, - '6': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, - '6-1': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, + '600': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, + '600-601': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, '7': { icon: 'icons/traffic-watersup.svg', color: '#C75746', bcolor: '#938626' }, '7-1': { icon: 'icons/traffic-watersup.svg', color: '#C75746', bcolor: '#938626' }, '8': { icon: 'icons/government.svg', color: '#C75746', bcolor: '#C75746' }, From fd214bfdb44322b7864b5b0f296c373cd50ac448 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 15:05:13 +0900 Subject: [PATCH 012/229] sig.markdown a --- _includes/sig.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sig.markdown b/_includes/sig.markdown index 674d3a3c..1b9642e4 100644 --- a/_includes/sig.markdown +++ b/_includes/sig.markdown @@ -1 +1 @@ -Where Does My Money Go? Yokohama team https://github.com/orezeni/orezeni.github.com +Where Does My Money Go? hyo-dai team https://github.com/Jizai2012ikusei/Jizai2012ikusei.github.io From 5dc443abfeafbf83209685630423ff87e42d5f47 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 15:06:31 +0900 Subject: [PATCH 013/229] default.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 3e86f234..ba771c1b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -28,7 +28,7 @@ {{ site.title }}
- あなたが横浜市に納めた税金がどこで使われているかをお示しします + あなたが加古川市に納めた税金がどこで使われているかをお示しします
From f4c05df7b2dec5eb2d777faa2aef9ebe95eba8ba Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 15:07:44 +0900 Subject: [PATCH 014/229] default.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index ba771c1b..d437f782 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -28,7 +28,7 @@ {{ site.title }}
- あなたが加古川市に納めた税金がどこで使われているかをお示しします + あなたが高砂市に納めた税金がどこで使われているかをお示しします
From 9fa893e58fb90a9f79f549450232ab7cde70591d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 15:10:04 +0900 Subject: [PATCH 015/229] default.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index d437f782..ba771c1b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -28,7 +28,7 @@ {{ site.title }}
- あなたが高砂市に納めた税金がどこで使われているかをお示しします + あなたが加古川市に納めた税金がどこで使われているかをお示しします
From c09669cf03ef27c5dfdccbfa54b078067446d016 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 15:11:42 +0900 Subject: [PATCH 016/229] index.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 76718cc2..f9a45147 100644 --- a/index.html +++ b/index.html @@ -89,7 +89,7 @@

あなたの年間収入を選んでください

-

あなたの横浜市税（年間）

+

あなたの加古川市税（年間）

¥31.12

From d8e5cb5702704ee0bdf6b0f8e82b03685722e5fe Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 15:14:03 +0900 Subject: [PATCH 017/229] setting.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 56abe0df..39ae6b5a 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,8 +18,8 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '100': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, - '100-101': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, + '1': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, + '1-11': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, '200': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, '2-2': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#0AB971' }, From bd31416e6e94acc090a93cd6f5a3f73fa1cab6a9 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 15:36:28 +0900 Subject: [PATCH 018/229] setting.js a --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 39ae6b5a..10211d14 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,8 +18,8 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '1': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, - '1-11': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, + '100': { icon: 'icon/planning.svg', color: '#C75746', bcolor: '#935B3B' }, + '100-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, '200': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, '2-2': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#0AB971' }, From f6f63187f7b8f0ee7cd5917193ea26993d7b8d1a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 15:37:54 +0900 Subject: [PATCH 019/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 10211d14..8acb7244 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,7 +18,7 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '100': { icon: 'icon/planning.svg', color: '#C75746', bcolor: '#935B3B' }, + '100': { icon: 'icons/planning.svg', color: '#C75746', bcolor: '#935B3B' }, '100-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, '200': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, From 6140f024cfbdd7cfd68e8e0a1c7dcd5ca8a76831 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 16:05:54 +0900 Subject: [PATCH 020/229] setting.js a --- js/setting.js | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/js/setting.js b/js/setting.js index 8acb7244..1ff4a87c 100644 --- a/js/setting.js +++ b/js/setting.js @@ -20,30 +20,27 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#C75746', bcolor: '#935B3B' }, '100-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, - '200': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, - '200-201': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, - '2-2': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#0AB971' }, - '3': { icon: 'icons/economy-tourism.svg', color: '#C75746', bcolor: '#4E6D00' }, - '3-1': { icon: 'icons/dollar.svg', color: '#C75746', bcolor: '#4E6D00' }, - '3-2': { icon: 'icons/harbor.svg', color: '#C75746', bcolor: '#4E6D00' }, - '3-3': { icon: 'icons/culture.svg', color: '#C75746', bcolor: '#4E6D00' }, - '4': { icon: 'icons/our-streets.svg', color: '#C75746', bcolor: '#D33673' }, - '4-1': { icon: 'icons/farms.svg', color: '#C75746', bcolor: '#D33673' }, - '4-2': { icon: 'icons/street-lights.svg', color: '#C75746', bcolor: '#D33673' }, - '4-3': { icon: 'icons/housing.svg', color: '#C75746', bcolor: '#D33673' }, - '5': { icon: 'icons/environment.svg', color: '#C75746', bcolor: '#2A3A03' }, - '5-1': { icon: 'icons/tree.svg', color: '#C75746', bcolor: '#2A3A03' }, - '5-2': { icon: 'icons/wind.svg', color: '#C75746', bcolor: '#2A3A03' }, + '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, + '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, + '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, + '300-301': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, + '400': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, + '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, + '500': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, + '500-501': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, '600': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, '600-601': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, - '7': { icon: 'icons/traffic-watersup.svg', color: '#C75746', bcolor: '#938626' }, - '7-1': { icon: 'icons/traffic-watersup.svg', color: '#C75746', bcolor: '#938626' }, - '8': { icon: 'icons/government.svg', color: '#C75746', bcolor: '#C75746' }, - '8-1': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#C75746' }, - '8-2': { icon: 'icons/government.svg', color: '#C75746', bcolor: '#C75746' }, - '9': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, - '9-1': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, - '10': { icon: 'icons/order-safety.svg', color: '#C75746', bcolor: '#790586' }, - '10-1': { icon: 'icons/order-safety.svg', color: '#C75746', bcolor: '#790586' } + '700': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#938626' }, + '700-701': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#938626' }, + '800': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, + '800-801': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, + '900': { icon: 'icons/fire-brigade.svg', color: '#C75746', bcolor: '#D33673' }, + '900-901': { icon: 'icons/fire-brigade.svg', color: '#C75746', bcolor: '#D33673' }, + '1000': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#790586' }, + '1000-1001': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#790586' }, + '1100': { icon: 'icons/dollar.svg', color: '#C75746', bcolor: '#D33673' }, + '1100-1101': { icon: 'icons/dollar.svg', color: '#C75746', bcolor: '#D33673' }, + '1200': { icon: 'icons/euro.svg', color: '#C75746', bcolor: '#D33673' }, + '1200-1201': { icon: 'icons/euro.svg', color: '#C75746', bcolor: '#D33673' } }; From d5f1f84c2abd9a5d61f3b36e9670cad965708cd4 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 16:08:39 +0900 Subject: [PATCH 021/229] setting.js a --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 1ff4a87c..1ab3c99e 100644 --- a/js/setting.js +++ b/js/setting.js @@ -28,8 +28,8 @@ OpenSpending.Styles.Cofog = { '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, '500': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, '500-501': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, - '600': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, - '600-601': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, + '600': { icon: 'icons/economy-torism.svg', color: '#C75746', bcolor: '#EC2406' }, + '600-601': { icon: 'icons/economy-torism.svg', color: '#C75746', bcolor: '#EC2406' }, '700': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#938626' }, '700-701': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#938626' }, '800': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, From 2116b65091a7753992dc32941fda3f967a39e6db Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 16:13:36 +0900 Subject: [PATCH 022/229] setting.js a --- js/setting.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/setting.js b/js/setting.js index 1ab3c99e..7e869647 100644 --- a/js/setting.js +++ b/js/setting.js @@ -28,10 +28,10 @@ OpenSpending.Styles.Cofog = { '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, '500': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, '500-501': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, - '600': { icon: 'icons/economy-torism.svg', color: '#C75746', bcolor: '#EC2406' }, - '600-601': { icon: 'icons/economy-torism.svg', color: '#C75746', bcolor: '#EC2406' }, - '700': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#938626' }, - '700-701': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#938626' }, + '600': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#EC2406' }, + '600-601': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#EC2406' }, + '700': { icon: 'icons/economy-torism.svg', color: '#C75746', bcolor: '#938626' }, + '700-701': { icon: 'icons/economy-torism.svg', color: '#C75746', bcolor: '#938626' }, '800': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, '800-801': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, '900': { icon: 'icons/fire-brigade.svg', color: '#C75746', bcolor: '#D33673' }, From 0393d70a6c7ecb637b634b2ab53340adf357aa53 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 16:19:09 +0900 Subject: [PATCH 023/229] setting.js a --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 7e869647..7c56bb01 100644 --- a/js/setting.js +++ b/js/setting.js @@ -30,8 +30,8 @@ OpenSpending.Styles.Cofog = { '500-501': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, '600': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#EC2406' }, '600-601': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#EC2406' }, - '700': { icon: 'icons/economy-torism.svg', color: '#C75746', bcolor: '#938626' }, - '700-701': { icon: 'icons/economy-torism.svg', color: '#C75746', bcolor: '#938626' }, + '700': { icon: 'icons/economy-tourism.svg', color: '#C75746', bcolor: '#938626' }, + '700-701': { icon: 'icons/economy-tourism.svg', color: '#C75746', bcolor: '#938626' }, '800': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, '800-801': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, '900': { icon: 'icons/fire-brigade.svg', color: '#C75746', bcolor: '#D33673' }, From dbaf4d6ccd52f420124b38d98d14a94bf41fe8a0 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 28 Nov 2014 16:46:13 +0900 Subject: [PATCH 024/229] bubbletree-map.html a --- bubbletree-map.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bubbletree-map.html b/bubbletree-map.html index aa175ffb..513fa6b6 100644 --- a/bubbletree-map.html +++ b/bubbletree-map.html @@ -9,7 +9,7 @@ window.wdmmg_cramap = {}; var os_path = 'http://assets.openspending.org/openspendingjs/master'; - var year = '2010'; + var year = '2014'; yepnope.errorTimeout = 1000; From 2fdb48cfee6be7ec09b7aad0f3d39e64769c5dbf Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 15:27:21 +0900 Subject: [PATCH 025/229] setting.js q --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 7c56bb01..e22df863 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'jinzai2014ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From e8ca8daf1570a0dca0a47474fcdbcff5aa5337be Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 15:43:47 +0900 Subject: [PATCH 026/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index e22df863..df492782 100644 --- a/js/setting.js +++ b/js/setting.js @@ -19,7 +19,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#C75746', bcolor: '#935B3B' }, - '100-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, + '101-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From 039dea3727f4fa98777aa2b04386d704db1a2731 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 15:44:25 +0900 Subject: [PATCH 027/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index df492782..e22df863 100644 --- a/js/setting.js +++ b/js/setting.js @@ -19,7 +19,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#C75746', bcolor: '#935B3B' }, - '101-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, + '100-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From ad8ffc89ad168cb26a5f0d2810ae15187f3205eb Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 16:33:19 +0900 Subject: [PATCH 028/229] kakogawa_budget.csv a --- kakogawa_budget.csv | 13 ++++ yokohama_budget.csv | 176 -------------------------------------------- 2 files changed, 13 insertions(+), 176 deletions(-) create mode 100644 kakogawa_budget.csv delete mode 100644 yokohama_budget.csv diff --git a/kakogawa_budget.csv b/kakogawa_budget.csv new file mode 100644 index 00000000..c18fc7a2 --- /dev/null +++ b/kakogawa_budget.csv @@ -0,0 +1,13 @@ +Category category_id Subcategory subcateogory_id amount year +議会費 100 議会費 101 560923000 2014 +総務費 200 総務費 201 9773008000 2014 +民生費 300 民生費 301 29569600000 2014 +衛生費 400 衛生費 401 7066505000 2014 +労働費 500 労働費 501 1208718000 2014 +農林水産業費 600 農林水産業費 601 695072000 2014 +商工費 700 商工費 701 1281541000 2014 +土木費 800 土木費 801 8308786000 2014 +消防費 900 消防費 901 3264681000 2014 +教育費 1000 教育費 1001 4892408000 2014 +公積費 1100 公積費 1101 9108758000 2014 +予備費 1200 予備費 1201 100000000 2014 diff --git a/yokohama_budget.csv b/yokohama_budget.csv deleted file mode 100644 index 51d8a5b6..00000000 --- a/yokohama_budget.csv +++ /dev/null @@ -1,176 +0,0 @@ -UniqueKey,year,category_id,category,subcategory_id,subcategory,project_id,project,amount -2012-1,2012,1,健康福祉,1.1,健康福祉,project-1,国民健康保険事業,359535000 -2012-2,2012,1,健康福祉,1.1,健康福祉,project-2,介護保険事業,213391000 -2012-3,2012,1,健康福祉,1.1,健康福祉,project-3,生活保護費,124303000 -2012-4,2012,1,健康福祉,1.1,健康福祉,project-4,後期高齢者医療事業,63061000 -2012-5,2012,1,健康福祉,1.1,健康福祉,project-5,障害者自立支援法関連事業,59984000 -2012-6,2012,1,健康福祉,1.1,健康福祉,project-6,敬老特別乗車証・特別乗車券の交付,14514000 -2012-7,2012,1,健康福祉,1.1,健康福祉,project-7,こども青少年小児医療費の助成,6570000 -2012-8,2012,1,健康福祉,1.1,健康福祉,project-8,障害者地域作業所・小規模通所施設設置・運営,5024000 -2012-9,2012,1,健康福祉,1.1,健康福祉,project-9,個別予防接種事業,4476000 -2012-10,2012,1,健康福祉,1.1,健康福祉,project-10,子宮頸がん等ワクチン接種緊急促進事業,3748000 -2012-11,2012,1,健康福祉,1.1,健康福祉,project-11,がん対策の推進,3591000 -2012-12,2012,1,健康福祉,1.1,健康福祉,project-12,将来にわたるあんしん施策,2670000 -2012-13,2012,1,健康福祉,1.1,健康福祉,project-13,特別養護老人ホームの整備,2293000 -2012-14,2012,1,健康福祉,1.1,健康福祉,project-14,障害者施設の整備,1728000 -2012-15,2012,1,健康福祉,1.1,健康福祉,project-15,市立病院医療機能の充実・強化,1256000 -2012-16,2012,1,健康福祉,1.1,健康福祉,project-16,救急医療体制の充実,1137000 -2012-17,2012,1,健康福祉,1.1,健康福祉,project-17,小規模多機能型居宅介護事業所等の整備,698000 -2012-18,2012,1,健康福祉,1.1,健康福祉,project-18,地域医療体制の確保,651000 -2012-19,2012,1,健康福祉,1.1,健康福祉,project-19,被保護者の労支援,339000 -2012-20,2012,1,健康福祉,1.1,健康福祉,project-20,障害者自立生活アシスタントによる支援,330000 -2012-21,2012,1,健康福祉,1.1,健康福祉,project-21,地域ケアプラザの整備,304000 -2012-22,2012,1,健康福祉,1.1,健康福祉,project-22,精神科救急医療体制の充実,296000 -2012-23,2012,1,健康福祉,1.1,健康福祉,project-23,医療対応促進助成事業,268000 -2012-24,2012,1,健康福祉,1.1,健康福祉,project-24,障害者就労支援センターの運営と就労支援強化,265000 -2012-25,2012,1,健康福祉,1.1,健康福祉,project-25,定期巡回・随時対応型訪問介護看護事業所の整備,226000 -2012-26,2012,1,健康福祉,1.1,健康福祉,project-26,産科・周産期医療の充実,205000 -2012-27,2012,1,健康福祉,1.1,健康福祉,project-27,地域福祉・交流拠点モデル事業,180000 -2012-28,2012,1,健康福祉,1.1,健康福祉,project-28,障害者グループホームの整備,165000 -2012-29,2012,1,健康福祉,1.1,健康福祉,project-29,重度重複障害者(児)デイサーデイサービス激変緩和事業,144000 -2012-30,2012,1,健康福祉,1.1,健康福祉,project-30,介護サービス自己負担助成費,83000 -2012-31,2012,1,健康福祉,1.1,健康福祉,project-31,食育推進事業,69000 -2012-32,2012,1,健康福祉,1.1,健康福祉,project-32,介護支援ボランティアポイント事業,65000 -2012-33,2012,1,健康福祉,1.1,健康福祉,project-33,自殺対策事業,42000 -2012-34,2012,1,健康福祉,1.1,健康福祉,project-34,災害医療体制の充実,42000 -2012-35,2012,1,健康福祉,1.1,健康福祉,project-35,ノンステップバス導入費助成,38000 -2012-36,2012,1,健康福祉,1.1,健康福祉,project-36,ひとり暮らし高齢者「地域で見守り」推進事業,32000 -2012-37,2012,1,健康福祉,1.1,健康福祉,project-37,鉄道駅舎エレベーター設置事業,23000 -2012-38,2012,1,健康福祉,1.1,健康福祉,project-38,地域日常生活自立支援,16000 -2012-39,2012,1,健康福祉,1.1,健康福祉,project-39,地域日常生活自立支援,16000 -2012-40,2012,1,健康福祉,1.1,健康福祉,project-40,福祉人材就業支援事業,10000 -2012-41,2012,1,健康福祉,1.1,健康福祉,project-41,100万人の健康づくり戦略推進事業,10000 -2012-42,2012,2,子育て・教育,2.1,こども青少年,project-42,子どものための手当,62033000 -2012-43,2012,2,子育て・教育,2.1,こども青少年,project-43,横浜保育室の運営,7212000 -2012-44,2012,2,子育て・教育,2.1,こども青少年,project-44,保育所整備等,6572000 -2012-45,2012,2,子育て・教育,2.1,こども青少年,project-45,私立幼稚園の就園に対する補助,6334000 -2012-46,2012,2,子育て・教育,2.1,こども青少年,project-46,放課後児童育成推進,4433000 -2012-47,2012,2,子育て・教育,2.1,こども青少年,project-47,多様な保育ニーズへの対応,2570000 -2012-48,2012,2,子育て・教育,2.1,こども青少年,project-48,妊婦健康診査事業,2468000 -2012-49,2012,2,子育て・教育,2.1,こども青少年,project-49,地域療育センターの整備,877000 -2012-50,2012,2,子育て・教育,2.1,こども青少年,project-50,不妊相談・治療費助成事業,787000 -2012-51,2012,2,子育て・教育,2.1,こども青少年,project-51,地域子育て支援拠点の運営,687000 -2012-52,2012,2,子育て・教育,2.1,こども青少年,project-52,児童虐待対策関連事業,683000 -2012-53,2012,2,子育て・教育,2.1,こども青少年,project-53,家庭的保育の充実,612000 -2012-54,2012,2,子育て・教育,2.1,こども青少年,project-54,青少年の自立支援,511000 -2012-55,2012,2,子育て・教育,2.1,こども青少年,project-55,親子の居場所づくり支援,463000 -2012-56,2012,2,子育て・教育,2.1,こども青少年,project-56,地域療育センター児童デイサービス,287000 -2012-57,2012,2,子育て・教育,2.1,こども青少年,project-57,障害児の居場所づくり,246000 -2012-58,2012,2,子育て・教育,2.1,こども青少年,project-58,乳幼児一時預かり事業,161000 -2012-59,2012,2,子育て・教育,2.1,こども青少年,project-59,重症心身障害児施設の整備,75000 -2012-60,2012,2,子育て・教育,2.1,こども青少年,project-60,保育コンシェルジュの設置,68000 -2012-61,2012,2,子育て・教育,2.1,こども青少年,project-61,母子生活支援施設緊急一時保護事業,62000 -2012-62,2012,2,子育て・教育,2.1,こども青少年,project-62,障害児の医療連携支援,51000 -2012-63,2012,2,子育て・教育,2.1,こども青少年,project-63,青少年の就労に向けた自立支援の拡充,43000 -2012-64,2012,2,子育て・教育,2.1,こども青少年,project-64,ＤＶ被害者等に対する地域での生活に向けた支援の充実,28000 -2012-65,2012,2,子育て・教育,2.1,こども青少年,project-65,妊婦歯科健康診査事業,23000 -2012-66,2012,2,子育て・教育,2.1,こども青少年,project-66,事業所内保育施設助成事業,14000 -2012-67,2012,2,子育て・教育,2.1,こども青少年,project-67,横浜市なしの木学園の再整備,3000 -2012-68,2012,2,子育て・教育,2.2,教育,project-68,学校特別営繕費,12105000 -2012-69,2012,2,子育て・教育,2.2,教育,project-69,学校給食費事業,9220000 -2012-70,2012,2,子育て・教育,2.2,教育,project-70,小・中学校の整備,2410000 -2012-71,2012,2,子育て・教育,2.2,教育,project-71,横浜総合高等学再整備事業,1740000 -2012-72,2012,2,子育て・教育,2.2,教育,project-72,特別支援教育の推進,1530000 -2012-73,2012,2,子育て・教育,2.2,教育,project-73,子どもと向き合う時間の確保対策,1353000 -2012-74,2012,2,子育て・教育,2.2,教育,project-74,小中一貫英語教育の推進,1169000 -2012-75,2012,2,子育て・教育,2.2,教育,project-75,市立学校耐震対策事業,1074000 -2012-76,2012,2,子育て・教育,2.2,教育,project-76,いじめ・不登校対策等関連,941000 -2012-77,2012,2,子育て・教育,2.2,教育,project-77,市立学校空調設備設置事業,394000 -2012-78,2012,2,子育て・教育,2.2,教育,project-78,教師力の向上,61000 -2012-79,2012,2,子育て・教育,2.2,教育,project-79,小中一貫教育推進事業,36000 -2012-80,2012,2,子育て・教育,2.2,教育,project-80,災害から子どもを地域防災推進事業,20000 -2012-81,2012,2,子育て・教育,2.2,教育,project-81,市立学校食育推進事業,11000 -2012-82,2012,3,経済・観光,3.3,文化観光,project-82,文化施設整備事業,2762000 -2012-83,2012,3,経済・観光,3.3,文化観光,project-83,観光・ＭＩＣＥの推進,778000 -2012-84,2012,3,経済・観光,3.3,文化観光,project-84,横浜芸術アクション事業,392000 -2012-85,2012,3,経済・観光,3.3,文化観光,project-85,創造界隈形成事業,373000 -2012-86,2012,3,経済・観光,3.3,文化観光,project-86,プロモーションの推進,153000 -2012-87,2012,3,経済・観光,3.3,文化観光,project-87,アフリカ開発会議の開催推進,90000 -2012-88,2012,3,経済・観光,3.3,文化観光,project-88,スマートイルミネーション事業,52000 -2012-89,2012,3,経済・観光,3.3,文化観光,project-89,パフォーミングアーツ連携事業,29000 -2012-90,2012,3,経済・観光,3.1,経済,project-90,中小企業制度融資事業,70030000 -2012-91,2012,3,経済・観光,3.1,経済,project-91,企業誘致促進事業,2922000 -2012-92,2012,3,経済・観光,3.1,経済,project-92,信用保証料助成等,2095000 -2012-93,2012,3,経済・観光,3.1,経済,project-93,緊急雇用創出事業臨時特例交付金事業,1347000 -2012-94,2012,3,経済・観光,3.1,経済,project-94,中小製造業設備投資等助成事業,293000 -2012-95,2012,3,経済・観光,3.1,経済,project-95,中小企業新技術・新製品開発促進事業,284000 -2012-96,2012,3,経済・観光,3.1,経済,project-96,消費者トラブルへの対応,253000 -2012-97,2012,3,経済・観光,3.1,経済,project-97,職業訓練事業等,208000 -2012-98,2012,3,経済・観光,3.1,経済,project-98,商店街活性化支援,200000 -2012-99,2012,3,経済・観光,3.1,経済,project-99,市場の再編･機能強化事業,102000 -2012-100,2012,3,経済・観光,3.1,経済,project-100,中小企業支援コーディネート事業,38000 -2012-101,2012,3,経済・観光,3.1,経済,project-101,「横浜で働こう！」推進事業,37000 -2012-102,2012,3,経済・観光,3.1,経済,project-102,環境・温暖化対策分野産業振興事業,28000 -2012-103,2012,3,経済・観光,3.1,経済,project-103,バイオ産業活性化事業,23000 -2012-104,2012,3,経済・観光,3.1,経済,project-104,公民連携による国際技術協力(Y-PORT事業),21000 -2012-105,2012,3,経済・観光,3.1,経済,project-105,女性起業家支援事業,12000 -2012-106,2012,3,経済・観光,3.1,経済,project-106,横浜型地域貢献企業支援事業,12000 -2012-107,2012,3,経済・観光,3.2,港湾,project-107,ハブポート化の推進(国際コンテナ戦略港湾推進),15528000 -2012-108,2012,3,経済・観光,3.2,港湾,project-108,港湾整備費負担金,7700000 -2012-109,2012,3,経済・観光,3.2,港湾,project-109,ふ頭の整備,807000 -2012-110,2012,3,経済・観光,3.2,港湾,project-110,港湾物流施設電力対策支援事業,50000 -2012-111,2012,3,経済・観光,3.2,港湾,project-111,山下ふ頭土地利用検討調査,9000 -2012-112,2012,4,街づくり,4.3,建築,project-112,公共建築物の長寿命化,4000000 -2012-113,2012,4,街づくり,4.3,建築,project-113,公的住宅の整備等,3940000 -2012-114,2012,4,街づくり,4.3,建築,project-114,液状化への対応,70000 -2012-115,2012,4,街づくり,4.2,都市整備,project-115,下水道整備事業,36298000 -2012-116,2012,4,街づくり,4.2,都市整備,project-116,戸塚駅周辺地区まちづくり,9583000 -2012-117,2012,4,街づくり,4.2,都市整備,project-117,市街地開発の推進,3011000 -2012-118,2012,4,街づくり,4.2,都市整備,project-118,鉄道等ネットワーク形成,2444000 -2012-119,2012,4,街づくり,4.2,都市整備,project-119,まちの防災性向上,1364000 -2012-120,2012,4,街づくり,4.2,都市整備,project-120,関内・関外地区活性化推進事業,257000 -2012-121,2012,4,街づくり,4.2,都市整備,project-121,東横線跡地の整備,213000 -2012-122,2012,4,街づくり,4.2,都市整備,project-122,横浜駅周辺のまちづくり,193000 -2012-123,2012,4,街づくり,4.2,都市整備,project-123,市民発意による地域まちづくりの推進,68000 -2012-124,2012,4,街づくり,4.2,都市整備,project-124,新横浜都心の整備,15000 -2012-125,2012,4,街づくり,4.1,道路,project-125,都市計画道路等の整備,17366000 -2012-126,2012,4,街づくり,4.1,道路,project-126,横浜環状道路等整備,12245000 -2012-127,2012,4,街づくり,4.1,道路,project-127,道路の修繕,9486000 -2012-128,2012,4,街づくり,4.1,道路,project-128,主要地方道等の整備,6940000 -2012-129,2012,4,街づくり,4.1,道路,project-129,道路費負担金,4333000 -2012-130,2012,4,街づくり,4.1,道路,project-130,河川整備事業,3865000 -2012-131,2012,4,街づくり,4.1,道路,project-131,地域交通サポート,550000 -2012-132,2012,5,環境,5.2,温暖化対策,project-132,地球温暖化対策の推進,2919000 -2012-133,2012,5,環境,5.1,環境創造,project-133,横浜みどりアップ計画<みどり保全創造事業費会計>,16054000 -2012-134,2012,5,環境,5.1,環境創造,project-134,公園整備事業,13894000 -2012-135,2012,5,環境,5.1,環境創造,project-135,ライフライン防災機能強化,2775000 -2012-136,2012,5,環境,5.1,環境創造,project-136,放射線対策事業,2241000 -2012-137,2012,5,環境,5.1,環境創造,project-137,市街地における緑の保全・創造の推進,408000 -2012-138,2012,5,環境,5.1,環境創造,project-138,農地の保全,196000 -2012-139,2012,5,環境,5.1,環境創造,project-139,震災時仮設水洗トイレ用排水設備の整備,113000 -2012-140,2012,5,環境,5.1,環境創造,project-140,生物多様性の推進,23000 -2012-141,2012,5,環境,5.1,環境創造,project-141,市民との協働による樹林地の保全,16000 -2012-142,2012,5,環境,5.1,環境創造,project-142,美しい横浜港形成検討事業,6000 -2012-143,2012,5,環境,5.1,環境創造,project-143,きれいな海づくり事業,6000 -2012-144,2012,5,環境,5.1,環境創造,project-144,市民と農との地産地消の推進,2000 -2012-145,2012,5,環境,5.1,環境創造,project-145,市民・事業者等の協働による地域緑化の推進,2000 -2012-146,2012,6,市民,6.1,市民,project-146,個性ある区づくり推進費,13878000 -2012-147,2012,6,市民,6.1,市民,project-147,建築物耐震性向上,10370000 -2012-148,2012,6,市民,6.1,市民,project-148,区庁舎等の整備,3085000 -2012-149,2012,6,市民,6.1,市民,project-149,市民協働推進の取組,1381000 -2012-150,2012,6,市民,6.1,市民,project-150,コミュニティハウス整備事業,157000 -2012-151,2012,6,市民,6.1,市民,project-151,元気な地域づくり推進事業,97000 -2012-152,2012,6,市民,6.1,市民,project-152,大規模スポーツイベント誘致,20000 -2012-153,2012,6,市民,6.1,市民,project-153,プロスポーツチームの支援,10000 -2012-154,2012,6,市民,6.1,市民,project-154,働く女性応援プログラム,7000 -2012-155,2012,6,市民,6.1,市民,project-155,大規模スポーツ施設等の検討調査,6000 -2012-156,2012,6,市民,6.1,市民,project-156,犯罪被害者等相談支援,5000 -2012-157,2012,7,交通・水道,7.1,交通・水道,project-157,安全でおいしい水の供給,19371000 -2012-158,2012,7,交通・水道,7.1,交通・水道,project-158,電気式ハイブリッドバスの導入,297000 -2012-159,2012,7,交通・水道,7.1,交通・水道,project-159,国際貢献の推進と海外水ビジネス展開の支援,34000 -2012-160,2012,8,政策,8.1,総務,project-160,プール等の利用状況等調査,14000 -2012-161,2012,8,政策,8.2,政策,project-161,市立大学運営交市大への運営交付金・貸付金,12471000 -2012-162,2012,8,政策,8.2,政策,project-162,国際協力及び国際平和推進,156000 -2012-163,2012,8,政策,8.2,政策,project-163,自治体外交推進,25000 -2012-164,2012,8,政策,8.2,政策,project-164,市内大学と地域がつながるまち,12000 -2012-165,2012,8,政策,8.2,政策,project-165,姉妹都市提携周年記念,9000 -2012-166,2012,9,資源循環,9.1,資源循環,project-166,最終処分場の安定的な確保,6094000 -2012-167,2012,9,資源循環,9.1,資源循環,project-167,ごみ減量・リサイクルの推進,2638000 -2012-168,2012,9,資源循環,9.1,資源循環,project-168,戸塚区品濃町最終処分場の改善工事,1643000 -2012-169,2012,9,資源循環,9.1,資源循環,project-169,高齢者等のニーズに応じたごみ出し支援の実施,13000 -2012-170,2012,10,消防,10.1,消防,project-170,消防力の強化,3232000 -2012-171,2012,10,消防,10.1,消防,project-171,津波警報伝達システムの整備,686000 -2012-172,2012,10,消防,10.1,消防,project-172,自家用給油取扱所の整備,297000 -2012-173,2012,10,消防,10.1,消防,project-173,地域防犯活動支援事業,58000 -2012-174,2012,10,消防,10.1,消防,project-174,消防・救急デジタル無線整備,44000 -2012-175,2012,10,消防,10.1,消防,project-175,横浜市防災計画のの修正,40000 From 1762b1d5c16691570081c6546e713642e815ab05 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 16:54:41 +0900 Subject: [PATCH 029/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index e22df863..df492782 100644 --- a/js/setting.js +++ b/js/setting.js @@ -19,7 +19,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#C75746', bcolor: '#935B3B' }, - '100-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, + '101-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From 6156803fa3dcf29672628accceb4f6faa56dccf7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 16:55:51 +0900 Subject: [PATCH 030/229] team ^-^b --- team.html | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/team.html b/team.html index 7c08c9a9..f48615a1 100644 --- a/team.html +++ b/team.html @@ -16,17 +16,11 @@

Core Team

    -
  • 伊藤　大貴(Hirotaka Itou), @hirochan (Adviser)
    • -
  • 川島　宏一(Hiroichi Kawashima), @hiroichi_k (Coordinator)
    • -
  • 佐藤　宏之(Hiroyuki Sato), @sa2hi (Linked Open Data化)
    • -
  • 関　治之(Hal Seki:@hal_sk), Hack For Japan (Developer)
    • -
  • 高木　祐介(Takagi Yuusuke:@nyatakasan), (Developer)
    • -
  • 高野　光弘(TAKANO Mitsuhiro), @takano32 (Developer)
    • -
  • 竹内　久知(Takeuchi Hisatomo:@3Dfalcon), 機能型3Dアルバム (Designer)
    • -
  • 田島　逸郎(Itsuro Tajima), @niryuu (Developer)
    • -
  • 玉木　光(Tamaki Hikaru), Pearlpuppy.com (Designer)
    • -
  • 西林　孝(Takashi Nishibayashi), @hagino3000 (Developer)
    • -
  • 藤村　良弘(Fujimura Yoshihiro), Facebook:Fujimura Yoshihiro (Policy Analyst)
    • +
  • 沖野　保志(Okino Yasushi), (Developer)
    • +
  • 蓬莱　大流(Hourai Masaru), (Developer)
    • +
  • 藤中　紳之介(Fujinaka Shinnosuke), (Developer)
    • +
  • 奥村　健也(Okumura Kenya), (Coordinator)
    • +
  • 高野　敦子(Takano Atsuko), (Adviser)
From f5a035cf1dd69a67280bc0a396d8956c1c07e924 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 17:17:36 +0900 Subject: [PATCH 031/229] =?UTF-8?q?team=20=E4=BA=BA=E6=9D=90=E8=82=B2?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^- -

Core Team

+

Team 人材育成

@@ -23,5 +23,24 @@

Core Team

  • 高野　敦子(Takano Atsuko), (Adviser)
    • +

    Core Team

    + +
    +
    + + +
    From 565fbc2f3852137caaa0ced354712fd567177ddf Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 17:18:55 +0900 Subject: [PATCH 032/229] rei out --- team.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/team.html b/team.html index 26f420f5..332f6107 100644 --- a/team.html +++ b/team.html @@ -25,9 +25,6 @@

    Team 人材育成

    Core Team

    -
    -
    -
    • 伊藤　大貴(Hirotaka Itou), @hirochan (Adviser)
    • 川島　宏一(Hiroichi Kawashima), @hiroichi_k (Coordinator)
      • From f96bdfb62ba2721ee996035ffda46d03c9b535b1 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Dec 2014 17:21:49 +0900 Subject: [PATCH 033/229] nn ^-^v --- team.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/team.html b/team.html index 332f6107..535d0b14 100644 --- a/team.html +++ b/team.html @@ -25,6 +25,9 @@

      Team 人材育成

      Core Team

      +
      +
      +
      • 伊藤　大貴(Hirotaka Itou), @hirochan (Adviser)
      • 川島　宏一(Hiroichi Kawashima), @hiroichi_k (Coordinator)
        • From 7c3d328a9105500b41cec8a955e47fa12d9fccc9 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 9 Dec 2014 10:38:06 +0900 Subject: [PATCH 034/229] setting.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index df492782..b7bc4ccd 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,7 +18,7 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '100': { icon: 'icons/planning.svg', color: '#C75746', bcolor: '#935B3B' }, + '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#935B3B' }, '101-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, From 2ba2f75b5e82e0a9e386f02d9404b8b6be9ec6d3 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 13:23:12 +0900 Subject: [PATCH 035/229] team.html a --- team.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/team.html b/team.html index 535d0b14..05a6d095 100644 --- a/team.html +++ b/team.html @@ -12,8 +12,7 @@

        Team 人材育成

        -
        -
        +
        • 沖野　保志(Okino Yasushi), (Developer)
          • From fe8323440b2c337893be7d4fa4efb014466388d4 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 13:29:03 +0900 Subject: [PATCH 036/229] team.html c --- team.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/team.html b/team.html index 05a6d095..535d0b14 100644 --- a/team.html +++ b/team.html @@ -12,7 +12,8 @@

          Team 人材育成

          - +
          +
          • 沖野　保志(Okino Yasushi), (Developer)
            • From adcf9316f2a73934925d4f6727639f2c00d11e19 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 13:30:05 +0900 Subject: [PATCH 037/229] team.html w --- team.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/team.html b/team.html index 535d0b14..d787b6d3 100644 --- a/team.html +++ b/team.html @@ -25,7 +25,7 @@

            Team 人材育成

            Core Team

            -
            +
              From 63977efb367d5d9cf56b568621e8fc3ba7e7548f Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 13:32:52 +0900 Subject: [PATCH 038/229] team.html s --- team.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/team.html b/team.html index d787b6d3..c47dfc0f 100644 --- a/team.html +++ b/team.html @@ -13,7 +13,7 @@

              Team 人材育成

              -
              +
              • 沖野　保志(Okino Yasushi), (Developer)
                • @@ -25,8 +25,8 @@

                Team 人材育成

                Core Team

                +
                -
                • 伊藤　大貴(Hirotaka Itou), @hirochan (Adviser)
                  • From d24ec9379e0a9fefbd2f590f2d285545f1a17a06 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:11:47 +0900 Subject: [PATCH 039/229] team.html s --- team.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/team.html b/team.html index c47dfc0f..ddf6aab1 100644 --- a/team.html +++ b/team.html @@ -11,9 +11,8 @@

                  Team 人材育成

                  -
                  - +
                  • 沖野　保志(Okino Yasushi), (Developer)
                    • @@ -23,10 +22,11 @@

                    Team 人材育成

                  • 高野　敦子(Takano Atsuko), (Adviser)
                  +
                  +

                  Core Team

                  - -
                  - +
                  +
                  • 伊藤　大貴(Hirotaka Itou), @hirochan (Adviser)
                    • From 52b312003aca56534c7792cb47779664bae91509 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:22:08 +0900 Subject: [PATCH 040/229] setting.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index b7bc4ccd..43fe5797 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,7 +18,7 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#935B3B' }, + '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, '101-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, From dcc1c200f74cad20afce63af5168a4e844496bb7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:23:22 +0900 Subject: [PATCH 041/229] setting.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あｑ --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 43fe5797..5b58a9f2 100644 --- a/js/setting.js +++ b/js/setting.js @@ -19,7 +19,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, - '101-101': { icon: 'icons/plannig.svg', color: '#C75746', bcolor: '#935B3B' }, + '101-101': { icon: 'icons/plannig.svg', color: '#4169E1', bcolor: '#98fb98' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From ca41937dd4d74bf1cbf4520175cb201d4abdc6fa Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:28:27 +0900 Subject: [PATCH 042/229] style.css MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ｑ --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index 8970492f..07822b90 100644 --- a/css/style.css +++ b/css/style.css @@ -41,7 +41,7 @@ blockquote p { } a { - color: #830242; + color: #98fb98; } .chromeframe { From 668d0ca24dc638ed654ad14edd150dfdb396c68a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:33:57 +0900 Subject: [PATCH 043/229] dailybread.css MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- css/dailybread.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/dailybread.css b/css/dailybread.css index 8ba04d14..f8c1f033 100644 --- a/css/dailybread.css +++ b/css/dailybread.css @@ -31,7 +31,7 @@ } #db-header h1 { - color: #830242; + color: #AEEBDF ; font-size: 2.5em; text-transform: uppercase; } @@ -61,7 +61,7 @@ #db-topbar div p { margin: 0; padding: 0; - color: #830242; + color: #AEEBDF ; font-size: 1.5em; font-weight: bold; } From 9567987604f193ef7685b0ac594cfed650ae308f Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:36:36 +0900 Subject: [PATCH 044/229] a d --- css/{dailybread.css => s} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename css/{dailybread.css => s} (95%) diff --git a/css/dailybread.css b/css/s similarity index 95% rename from css/dailybread.css rename to css/s index f8c1f033..4d69b0d3 100644 --- a/css/dailybread.css +++ b/css/s @@ -31,7 +31,7 @@ } #db-header h1 { - color: #AEEBDF ; + color: #98fb98; font-size: 2.5em; text-transform: uppercase; } @@ -61,7 +61,7 @@ #db-topbar div p { margin: 0; padding: 0; - color: #AEEBDF ; + color: #98fb98 ; font-size: 1.5em; font-weight: bold; } @@ -88,7 +88,7 @@ .wdmmg-slider.ui-widget-content { background: none; - background-color: #830242; + background-color: #98fb98; height: 6px; } @@ -136,7 +136,7 @@ } .db-area-col.active { - color: #830242; + color: #98fb98; font-weight: bold; } @@ -183,7 +183,7 @@ } #select-dependents-type > div.active { - color: #830242; + color: #98fb98; font-weight: bold; } @@ -203,7 +203,7 @@ } #select-dependents-type > div.active path { - fill: #830242; + fill: #98fb98; stroke: none; } From 6598120cce2d2ab10210b5f9b74ce4e78a545daf Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:41:58 +0900 Subject: [PATCH 045/229] dailybread.css a --- css/{s => dailybread.css} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename css/{s => dailybread.css} (95%) diff --git a/css/s b/css/dailybread.css similarity index 95% rename from css/s rename to css/dailybread.css index 4d69b0d3..7b91a34d 100644 --- a/css/s +++ b/css/dailybread.css @@ -31,7 +31,7 @@ } #db-header h1 { - color: #98fb98; + color: #830242; font-size: 2.5em; text-transform: uppercase; } @@ -61,7 +61,7 @@ #db-topbar div p { margin: 0; padding: 0; - color: #98fb98 ; + color: #830242; font-size: 1.5em; font-weight: bold; } @@ -88,7 +88,7 @@ .wdmmg-slider.ui-widget-content { background: none; - background-color: #98fb98; + background-color: #830242; height: 6px; } @@ -136,7 +136,7 @@ } .db-area-col.active { - color: #98fb98; + color: #830242; font-weight: bold; } @@ -183,7 +183,7 @@ } #select-dependents-type > div.active { - color: #98fb98; + color: #830242; font-weight: bold; } @@ -203,7 +203,6 @@ } #select-dependents-type > div.active path { - fill: #98fb98; + fill: #830242; stroke: none; } - From 115a37197f689215cd1cd71ad6b974b67c28016d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:47:40 +0900 Subject: [PATCH 046/229] dailybread.css gi --- css/dailybread.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/dailybread.css b/css/dailybread.css index 7b91a34d..ad16ed48 100644 --- a/css/dailybread.css +++ b/css/dailybread.css @@ -31,7 +31,7 @@ } #db-header h1 { - color: #830242; + color: #00bfff; font-size: 2.5em; text-transform: uppercase; } @@ -61,7 +61,7 @@ #db-topbar div p { margin: 0; padding: 0; - color: #830242; + color: #00bfff; font-size: 1.5em; font-weight: bold; } From 016c49adde31eb7bf821f0966bdec15845fbf45f Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:49:35 +0900 Subject: [PATCH 047/229] style.css s --- css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/style.css b/css/style.css index 07822b90..5abd0b91 100644 --- a/css/style.css +++ b/css/style.css @@ -41,7 +41,7 @@ blockquote p { } a { - color: #98fb98; + color: #00bfff; } .chromeframe { @@ -117,7 +117,7 @@ footer ul.footer-links { } footer a, footer a:hover { - color: #AEEBDF; + color: #00bfff; } From c8d1531d02a4ab33a717ef0b0ea1a2ad21c7f44c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:57:39 +0900 Subject: [PATCH 048/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 5b58a9f2..0c63458e 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2014ikusei'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 951dbae6ebea3ee68846ed8a41fc1e60f0612346 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 14:58:27 +0900 Subject: [PATCH 049/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 0c63458e..5b58a9f2 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'jinzai2014ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 8a321555f60888cd064779309956e0224b73d3a7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:04:38 +0900 Subject: [PATCH 050/229] setting.js f --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 5b58a9f2..488f8866 100644 --- a/js/setting.js +++ b/js/setting.js @@ -19,7 +19,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, - '101-101': { icon: 'icons/plannig.svg', color: '#4169E1', bcolor: '#98fb98' }, + '101': { icon: 'icons/plannig.svg', color: '#4169E1', bcolor: '#98fb98' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From 0cb7d542a21fc70994a1b384e10b5b3b92d0cb8b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:05:08 +0900 Subject: [PATCH 051/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 488f8866..7cf08362 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2014ikusei'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From fa207ca02f81ba0d9fa2790c584b078caeac524c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:06:03 +0900 Subject: [PATCH 052/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 7cf08362..488f8866 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'jinzai2014ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 6bd1ce2ab193037829fab138fc69b45797f765cb Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:06:41 +0900 Subject: [PATCH 053/229] setting.js fs --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 488f8866..73c3ebb8 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2014ikusei'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; @@ -19,7 +19,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, - '101': { icon: 'icons/plannig.svg', color: '#4169E1', bcolor: '#98fb98' }, + '100-101': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From 7414ca3730acbf3dbac62c39c080ba3e4e97b83c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:09:58 +0900 Subject: [PATCH 054/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 73c3ebb8..f99e86e5 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'jinzai2014ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 66e15c9471a5efe9ba2e97f6f4234b377ed1e0b3 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:28:56 +0900 Subject: [PATCH 055/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index f99e86e5..36652afc 100644 --- a/js/setting.js +++ b/js/setting.js @@ -19,7 +19,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, - '100-101': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, + '101-101': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From 87091a414207438e085ed4bf8a93553afa92af32 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:29:43 +0900 Subject: [PATCH 056/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 36652afc..f99e86e5 100644 --- a/js/setting.js +++ b/js/setting.js @@ -19,7 +19,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, - '101-101': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, + '100-101': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From eed1ac6dcb50bb4bffabe0d8bd51ee23340c03d9 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:39:46 +0900 Subject: [PATCH 057/229] about.html c --- about.html | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/about.html b/about.html index b17b4874..353daa6a 100644 --- a/about.html +++ b/about.html @@ -9,12 +9,17 @@

                    Where Does My Money Go? とは何ですか？

                    Where Does My Money Go? は、納税者である国民一人ひとりが、支払っている税金の使われ方を具体的に理解し、税金の使われ方を決める当事者として責任ある意見を述べることを手助けすることを目的としています。私達は、国民一人ひとりが、公共サービスにおける受益と負担の関係を数字で理解したうえで、私ならこう税金を使って欲しいという具体的で責任のある意見を述べることができるようなることが、日本の財政を健全化させ、日本を新たな成長へと導く近道に違いないと考えています。

                    -

                    Where Does My Money Go? β版（2012年7月1日稼働）は、横浜市民が横浜市に納めている市税を対象として構築したものです。自分の年間総収入をスライドで設定し、単身世帯か扶養一人世帯かを選択すると、給与所得者であるという前提で、横浜市に納めている市税年総額と10分野毎に一日当たり支払っている市税額が表示されます。所得控除額は、単身世帯の場合33万円、扶養一人世帯の場合66万円、市税負担額は課税対象額の6％と設定しています。また、10分野への税金の配分比率は、横浜市の一般会計全体における10分野への予算配分比率(24年1月1日現在)を使っています。

                    - -

                    現在このβ版は、横浜市税だけを対象としたものですが、今後、利用者の皆さんや日本政府や全国の自治体の皆さんのご意見、ご要望を踏まえて、特別会計や公営企業会計も含めたり、市債発行額・償還額を含めたり、神奈川県税や国税を含めたりなど、ニーズに応じて、どんどん成長させて行きたいと考えております。是非、皆様からの忌憚のないご意見、ご要望、ご指摘をお願いいたします。

                    +

                    Where Does My Money Go?Where Does My Money Go? 加古川市版　 +加古川市民が加古川市に納めている市税を対象として構築したものです。 +自分の年間総収入をスライドで設定し、単身世帯か扶養一人世帯かを選択すると、 +給与所得者であるという前提で、加古川市に納めている市税年総額と各分野に一日当たり支払っている市税額が表示されます。 +所得控除額は、単身世帯の場合33万円、扶養一人世帯の場合66万円、市税負担額は課税対象額の6％と設定しています。 +また、各分野への税金の配分比率は、加古川市の一般会計全体における各分野への予算配分比率(26年現在)を使っています. + + +

                    -

                    なお、このサイトは、公共データのオープン化によって、地域社会を変え、日本社会を変え、世界にも影響を与え、貢献して行こうという思いを持って集まったメンバーによって構築、運営されています。開発者の一覧

                    -
                    +

                  どうやって連絡を取ればいいですか？

                  @@ -25,7 +30,7 @@

                  どうやって連絡を取ればいいですか？

                -

                このサイトは、どのような経緯で生まれたのですか？

                +

                このサイトは、どのような経緯で作られたのですか？

                From 1ed077943591e216d4f95b025fa68d8e5a3fe5aa Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:45:57 +0900 Subject: [PATCH 058/229] about.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ｃ --- about.html | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/about.html b/about.html index 353daa6a..bd9b756a 100644 --- a/about.html +++ b/about.html @@ -34,7 +34,9 @@

                このサイトは、どの
                -

                Where Does My Money Go? はイギリスの Where Does My Money Go? を参考に、日本でも公共データのオープン化によって、地域社会を変え、日本社会を変え、世界にも影響を与え、貢献して行こうという思いを持って集まったメンバーによって構築、運営されています。イギリスの Where Does My Money Go? は Open Knowledge Foundation によって運営されています。

                +

                Where Does My Money Go? は普段は税金の使われ方や一人当たりどのくらい支払っているのか気にしてなかったが、最近では、増税やニュースなどで現在の税金の使い道など取り上げいるのを見て、自分が買い物や生活していくうえで税金は + 必ず払うものだがその税金は何に使われているのか気になりWhere Does My Money Go? 加古川市版をつくろうと考え作られた。 + Open Knowledge Foundation によって運営されています。

                @@ -44,25 +46,28 @@

                誰がこのサイトを運営しているのですか
                -

                このプロジェクトは市民の手で運営されているのが最大の特徴であり、今後、更になるデータの収集、分析を実施したいと考えています。ご関心を持った方は是非、ご参加下さい。問い合わせ先はコンタクトフォームからお願いいたします。

                +

                このプロジェクトは市民の手で運営されているのが最大の特徴であり、 + 今後、更になるデータの収集、分析を実施したいと考えています。 + ご関心を持った方は是非、ご参加下さい。 + 問い合わせ先はコンタクトフォームからお願いいたします。

                -

                横浜市だけなのですか？

                +

                ほかのところではやっていますか？

                -

                各地の有志の手により、横浜以外にもサイトが立ち上がっています。詳細は関連サイトからご確認いただけます。

                +

                各地の有志の手により、ほかのところでもサイトが立ち上がっています。詳細は関連サイトからご確認いただけます。

                -

                このプロジェクトは、何らかの政治、宗教または特定の団体との関係がありますか？

                +

                -

                Where Does My Money Go? は横浜市税がどのように使われたかを示すサイトであり、一切の政治・宗教・特定の団体とは関係がありません。また、横浜市税を何に使うべきで、何に使うべきでないのかを主張するサイトでもありません。今回のプロジェクトの大きな目的は私たちが納めた税金がどのように使われているかを知ることであり、どのように使うべきかをコメントするものではありません。私たちは Where Does My Money Go? が利用するすべての人にとって使いやすいものであることを願っています。

                +

                Where Does My Money Go?

                From c0a09b86a42fb593b57d69d7be31f426f9daeb6a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:49:20 +0900 Subject: [PATCH 059/229] dailybread.js a --- js/dailybread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/dailybread.js b/js/dailybread.js index f3de7678..132f84cb 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -45,7 +45,7 @@ OpenSpending.DailyBread = function (elem) { value: this.salaryVal, min: 1000000, max: 20000000, - step: 10000, + step: 1000, animate: true, slide: function () { self.sliderUpdated.apply(self, arguments) } }) From 4818c4b0cb6e4444dbc87537f139ef52992a3068 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:50:54 +0900 Subject: [PATCH 060/229] about.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ｃ --- about.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/about.html b/about.html index bd9b756a..5b1dcb73 100644 --- a/about.html +++ b/about.html @@ -34,7 +34,8 @@

                このサイトは、どの
                -

                Where Does My Money Go? は普段は税金の使われ方や一人当たりどのくらい支払っているのか気にしてなかったが、最近では、増税やニュースなどで現在の税金の使い道など取り上げいるのを見て、自分が買い物や生活していくうえで税金は +

                私は普段税金の使われ方や一人当たりどのくらい支払っているのか気にしてなかったが、最近では、 + 増税やニュースなどで現在の税金の使い道など取り上げいるのを見て、自分が買い物や生活していくうえで税金は 必ず払うものだがその税金は何に使われているのか気になりWhere Does My Money Go? 加古川市版をつくろうと考え作られた。 Open Knowledge Foundation によって運営されています。

                @@ -42,7 +43,7 @@

                このサイトは、どの

                -

                誰がこのサイトを運営しているのですか？

                +

                誰がこのサイトを運営しているのですか？？？

                From 81c0bfaacc1f7031c2972a9c14076505e832a2ff Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:53:11 +0900 Subject: [PATCH 061/229] dailybread.js a --- js/dailybread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/dailybread.js b/js/dailybread.js index 132f84cb..fa7f2439 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -233,7 +233,7 @@ OpenSpending.renderDependentTypes = function(db) { $(target).bind('click', handleClick); var r = Raphael(target, iconRad * 2, iconRad * 2 + 5); - r.circle(iconRad,iconRad,iconRad).attr({ fill: '#830242', stroke: 'none' }); + r.circle(iconRad,iconRad,iconRad).attr({ fill: '#00bfff', stroke: 'none' }); r.circle(iconRad,iconRad,iconRad-2).attr({ fill: 'none', stroke: '#eee', opacity: .8, 'stroke-dasharray': '- ' }); $.get(iconPath, function(svg) { if (typeof(svg) == "string") { From a5abd9a2ef75b37227ebbe3324dfb7b632ad758b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 15:53:20 +0900 Subject: [PATCH 062/229] about.html c --- about.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about.html b/about.html index 5b1dcb73..835e012d 100644 --- a/about.html +++ b/about.html @@ -9,7 +9,7 @@

                Where Does My Money Go? とは何ですか？

                Where Does My Money Go? は、納税者である国民一人ひとりが、支払っている税金の使われ方を具体的に理解し、税金の使われ方を決める当事者として責任ある意見を述べることを手助けすることを目的としています。私達は、国民一人ひとりが、公共サービスにおける受益と負担の関係を数字で理解したうえで、私ならこう税金を使って欲しいという具体的で責任のある意見を述べることができるようなることが、日本の財政を健全化させ、日本を新たな成長へと導く近道に違いないと考えています。

                -

                Where Does My Money Go?Where Does My Money Go? 加古川市版　 +

                Where Does My Money Go?加古川市版　 加古川市民が加古川市に納めている市税を対象として構築したものです。 自分の年間総収入をスライドで設定し、単身世帯か扶養一人世帯かを選択すると、 給与所得者であるという前提で、加古川市に納めている市税年総額と各分野に一日当たり支払っている市税額が表示されます。 @@ -37,7 +37,7 @@

                このサイトは、どの

                私は普段税金の使われ方や一人当たりどのくらい支払っているのか気にしてなかったが、最近では、 増税やニュースなどで現在の税金の使い道など取り上げいるのを見て、自分が買い物や生活していくうえで税金は 必ず払うものだがその税金は何に使われているのか気になりWhere Does My Money Go? 加古川市版をつくろうと考え作られた。 - Open Knowledge Foundation によって運営されています。

                +

                From 984847fd27fe5b5ab66efe883c529eb0189d302e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 16:00:50 +0900 Subject: [PATCH 063/229] dailybread.css a --- css/dailybread.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/dailybread.css b/css/dailybread.css index ad16ed48..e45fa1b2 100644 --- a/css/dailybread.css +++ b/css/dailybread.css @@ -88,7 +88,7 @@ .wdmmg-slider.ui-widget-content { background: none; - background-color: #830242; + background-color: #00bfff; height: 6px; } From c077345587927570972e2c3ee0ae8fd6cb725deb Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 16:05:02 +0900 Subject: [PATCH 064/229] setting.js a --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index f99e86e5..7a814d51 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,8 +18,8 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '100': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, - '100-101': { icon: 'icons/planning.svg', color: '#4169E1', bcolor: '#98fb98' }, + '100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, + '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From 7ad7b0ae8715f7c8437de9b04fcf09c23ef640be Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 16:09:27 +0900 Subject: [PATCH 065/229] sources.html fs --- sources.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sources.html b/sources.html index e45576ee..9fd7a1fe 100644 --- a/sources.html +++ b/sources.html @@ -7,11 +7,7 @@

                データの出所

                -

                このサイトは以下の３種類のデータを用いています。第１は、横浜市の一般会計当初予算の使いみち１０分類のデータ・ラベル。第２は、この１０分類を更に細分類した２０分類のデータ・ラベル。第３は、横浜市の２４年度一般会計予算の２０分類別の予算比率データです。

                - -

                第１および第２のデータ・ラベルは、横浜市財政局財政課による「平成２４年度予算案について　資料編」９８頁の「市民一人あたり予算の使いみち（一般会計）」表中の分野名および局・統括本部名を用いています。

                - -

                第３の予算比率データは、前出「平成２４年度予算案について」３６〜７２頁の「４　２４年度の主要事業一覧（１） ２４年度局の主要事業一覧」表中の局・統括本部の主要事業予算総額の比率を用いています。

                +

                加古川市「平成26年度 一般会計款別集計表」のデータを用いています。

                @@ -20,7 +16,7 @@

                どのように、可視化に使っているデータ
                - 横浜市財政局財政課が「平成２４年度予算案について　資料編」において用いている一般会計予算の使いみち10分類および局・統括本部２０分類を使っています。 + 加古川市「平成26年度 一般会計款別集計表」において用いている一般会計予算の使いみち12款を使っています。

                いつの時点のデータを使っているのか？

                From 61acdd12ecedf6b154189e5d5359fb5e1427b7fc Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Dec 2014 16:15:59 +0900 Subject: [PATCH 066/229] README.md as --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 68f29d87..a5569220 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# 俺のゼニはどこ行った for 横浜 +# 俺のゼニはどこ行った for 加古川 -wheredoesmymoney.orgの横浜バージョンです． +wheredoesmymoney.orgの加古川バージョンです． http://spending.jp/ で稼働しているサイトのソースコードです。 @@ -10,6 +10,13 @@ Where Does My Money Go? β版（2012年7月1日稼働）は、横浜市民が横 なお、このサイトは、公共データのオープン化によって、地域社会を変え、日本社会を変え、世界にも影響を与え、貢献して行こうという思いを持って集まった以下のメンバーによって構築、運営されています。 +team 人材育成 + +沖野　保志(Yasushi Okino),(Developer) +蓬莱　大流(Masaru Hourai),(Developer) +藤中　紳之介(sinnnosuke Fujinaka),(Developer) +奥村　健也(Kenya Okumura),(Coordinator) +高野　敦子(Atuko Takano),(Adviser) Core Team: (@は Twitter Account) From f73c2217849f359427912f6be9c8bc91b713c167 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 11 Dec 2014 10:31:20 +0900 Subject: [PATCH 067/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 7a814d51..43038ceb 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2014ikusei'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 579b2b4d37626b8177e5613164c1290e382b81aa Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 14:46:51 +0900 Subject: [PATCH 068/229] dailybread.css a --- css/dailybread.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/dailybread.css b/css/dailybread.css index e45fa1b2..838c526f 100644 --- a/css/dailybread.css +++ b/css/dailybread.css @@ -136,7 +136,7 @@ } .db-area-col.active { - color: #830242; + color: #00bfff; font-weight: bold; } From a0cb8a91be3a4f63dcc5a51f3a91948ef5c86e3a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 14:50:24 +0900 Subject: [PATCH 069/229] dailybread.css a --- css/dailybread.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/dailybread.css b/css/dailybread.css index 838c526f..b7eaf86b 100644 --- a/css/dailybread.css +++ b/css/dailybread.css @@ -164,7 +164,7 @@ } .db-area-col.active .db-area-icon path { - fill: #830242; + fill: #00bfff; stroke: none; } @@ -183,7 +183,7 @@ } #select-dependents-type > div.active { - color: #830242; + color: #00bfff; font-weight: bold; } @@ -203,6 +203,6 @@ } #select-dependents-type > div.active path { - fill: #830242; + fill: #00bfff; stroke: none; } From c9e1fe64348c2dea1c2c19090aad68127e322dc3 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:07:00 +0900 Subject: [PATCH 070/229] sources.html sf --- sources.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources.html b/sources.html index 9fd7a1fe..9fbac23a 100644 --- a/sources.html +++ b/sources.html @@ -23,7 +23,7 @@

                いつの時点のデータを使っているのか？ <
                - 平成２４年度横浜市予算のデータを使っています。 + 平成26年度加古川市予算のデータを使っています。
                @@ -31,7 +31,7 @@

                このサイト上で税金額はどのように計算
                -自分の年間総収入を入力し、単身世帯かそれ以外かを選択すると、給与所得者であるという前提で、年間に支払う市税年総額と一日当たりに支払っている市税額が表示されます。一日当たりの市税額は10分野に分類されています。また、１０の各分野毎に支払われている市税額は、それぞれ、主要な事業予算を担当している市税額に細分類されています。
                所得控除額は、単身世帯の場合33万円、扶養一人世帯の場合66万円、市税負担額は課税対象額の6％と設定しています。また、10分野への税金の配分比率は、横浜市の一般会計全体における10分野への予算配分比率(24年1月1日現在)を使っています。 +自分の年間総収入を入力し、単身世帯かそれ以外かを選択すると、給与所得者であるという前提で、年間に支払う市税年総額と一日当たりに支払っている市税額が表示されます。一日当たりの市税額は12款に分類されています。（また、12の各款毎に支払われている市税額は、それぞれ、主要な事業予算を担当している市税額に細分類されています。）
                所得控除額は、単身世帯の場合33万円、扶養一人世帯の場合66万円、市税負担額は課税対象額の6％と設定しています。また、12款への税金の配分比率は、加古川市の一般会計全体における12款（分類）への予算配分比率(26年1月1日現在)を使っています。
                From 535f0bd9313d1cd218ad39ffc95afae6f55a6bdb Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:17:59 +0900 Subject: [PATCH 071/229] sources.html sf --- sources.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources.html b/sources.html index 9fbac23a..bbedd3db 100644 --- a/sources.html +++ b/sources.html @@ -7,7 +7,7 @@

                データの出所

                -

                加古川市「平成26年度 一般会計款別集計表」のデータを用いています。

                +

                加古川市「平成26年度 一般会計款別集計表」のデータを用いています。

                @@ -49,7 +49,7 @@

                どのようなデータを使っているのですか
                - 今回のWhere Does My Money Go? β版は横浜市の平成24年度一般会計予算のうち、主要事業のみを対象としていますが、今後3000事業すべてを反映させる予定です。今後、各自治体や日本政府の一般会計、特別会計、公営企業会計へと対象を広げることも考えています。 + （今回のWhere Does My Money Go? β版は横浜市の平成24年度一般会計予算のうち、主要事業のみを対象としていますが、今後3000事業すべてを反映させる予定です。今後、各自治体や日本政府の一般会計、特別会計、公営企業会計へと対象を広げることも考えています。）
                From 6ae0caad9dbc730fe14781b2d9131e992df8865b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:21:34 +0900 Subject: [PATCH 072/229] sources.html sf --- sources.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources.html b/sources.html index bbedd3db..4f2d5245 100644 --- a/sources.html +++ b/sources.html @@ -7,7 +7,7 @@

                データの出所

                -

                加古川市「平成26年度 一般会計款別集計表」のデータを用いています。

                +

                加古川市「平成26年度 一般会計款別集計表」のデータを用いています。

                From fc7fa6d93b45f41c5870bc307ff7e50398af3480 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:40:10 +0900 Subject: [PATCH 073/229] default.html sf --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index ba771c1b..6cbf23b8 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -65,7 +65,7 @@

                - Where Does My Money Go? (日本語版 ver.1.0.) は、イギリスの Open Knowledge Foundation が開発した Where Does My Money Go? (英語版) をベースに開発されています。使われているデータは横浜市財政局財政課が作成している平成24年度一般会計予算のデータをもとにしています。Where Does My Money Go? プロジェクトは、公共データのオープン化を進める有志に支えられています。

                + Where Does My Money Go? (日本語版 ver.1.0.) は、イギリスの Open Knowledge Foundation が開発した Where Does My Money Go? (英語版) をベースに開発されています。使われているデータは加古川市（財政局財政課）が作成している平成26年度 一般会計款別集計表のデータをもとにしています。Where Does My Money Go? プロジェクトは、公共データのオープン化を進める有志に支えられています。

                • Where Does My Money Go?
                  • From 52d6f0d23fb95471994048afbf76c3c4fe049c9c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:49:45 +0900 Subject: [PATCH 074/229] setting.js sf --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 43038ceb..dd3e4625 100644 --- a/js/setting.js +++ b/js/setting.js @@ -20,7 +20,7 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, - '200': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, + '200': { icon: 'icons/publicaffairs.svg', color: '#c757ff', bcolor: '#c757ff' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, '300-301': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, From 67b1c6c54cd5832cd71ccbaaee687bc64920bb3b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:53:34 +0900 Subject: [PATCH 075/229] setting.js q --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index dd3e4625..4df8dc85 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'jinzai2014ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 5c4d0c7822d2bbe738a8ca3288f22f108a180d8d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:54:29 +0900 Subject: [PATCH 076/229] setting.js qa --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 4df8dc85..dd3e4625 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2014ikusei'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 29d03c860cd6501c78deaccf2e3a25db9022a7e8 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:58:14 +0900 Subject: [PATCH 077/229] setting.js sf --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index dd3e4625..aeacacbf 100644 --- a/js/setting.js +++ b/js/setting.js @@ -22,7 +22,7 @@ OpenSpending.Styles.Cofog = { '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '200': { icon: 'icons/publicaffairs.svg', color: '#c757ff', bcolor: '#c757ff' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, - '300': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, + '300': { icon: 'icons/financial-admin.svg', color: '', bcolor: '#4E6D00' }, '300-301': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, '400': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, From b99964180b2b2da0c28d80f8357c705bfd86003c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 15:59:24 +0900 Subject: [PATCH 078/229] setting.js sf --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index aeacacbf..7f9675f3 100644 --- a/js/setting.js +++ b/js/setting.js @@ -22,7 +22,7 @@ OpenSpending.Styles.Cofog = { '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '200': { icon: 'icons/publicaffairs.svg', color: '#c757ff', bcolor: '#c757ff' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, - '300': { icon: 'icons/financial-admin.svg', color: '', bcolor: '#4E6D00' }, + '300': { icon: 'icons/financial-admin.svg', color: '', bcolor: '' }, '300-301': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, '400': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, From 60f0d43baea79b8aabce5c95a36c71d7ccf0c5f1 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 16:00:00 +0900 Subject: [PATCH 079/229] setting.js sf --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 7f9675f3..c36c90ac 100644 --- a/js/setting.js +++ b/js/setting.js @@ -22,7 +22,7 @@ OpenSpending.Styles.Cofog = { '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '200': { icon: 'icons/publicaffairs.svg', color: '#c757ff', bcolor: '#c757ff' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, - '300': { icon: 'icons/financial-admin.svg', color: '', bcolor: '' }, + '300': { icon: 'icons/financial-admin.svg', color: , bcolor: }, '300-301': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, '400': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, From 2e1b19374cee1c7382de2784bd4b95aa4a134a2c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 16:02:06 +0900 Subject: [PATCH 080/229] setting.js sf --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index c36c90ac..593cddb7 100644 --- a/js/setting.js +++ b/js/setting.js @@ -22,7 +22,7 @@ OpenSpending.Styles.Cofog = { '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '200': { icon: 'icons/publicaffairs.svg', color: '#c757ff', bcolor: '#c757ff' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, - '300': { icon: 'icons/financial-admin.svg', color: , bcolor: }, + '300': { icon: 'icons/financial-admin.svg', color: , bcolor:'' }, '300-301': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, '400': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, From 5927c0c8f983294ad9b99f008b0596b6ffc9713d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 16:02:55 +0900 Subject: [PATCH 081/229] setting.js sf --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 593cddb7..2ceafacf 100644 --- a/js/setting.js +++ b/js/setting.js @@ -22,7 +22,7 @@ OpenSpending.Styles.Cofog = { '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '200': { icon: 'icons/publicaffairs.svg', color: '#c757ff', bcolor: '#c757ff' }, '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, - '300': { icon: 'icons/financial-admin.svg', color: , bcolor:'' }, + '300': { icon: 'icons/financial-admin.svg', color:'' , bcolor:'' }, '300-301': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, '400': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, From c420e83d6b91f5990f924b7b9c49a6dcb1217fee Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 17:00:48 +0900 Subject: [PATCH 082/229] default.html a --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 6cbf23b8..d03194ff 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -78,7 +78,7 @@
                • Core team
                • Data sources used on this site
                  • -
                • Code and making your own
                  • +
                • Code and making your own
                From 864f6a70210a4b3b24d4dfa425601702d64bc744 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 17:03:52 +0900 Subject: [PATCH 083/229] Update setting.js --- js/setting.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/setting.js b/js/setting.js index 2ceafacf..42561a2a 100644 --- a/js/setting.js +++ b/js/setting.js @@ -20,11 +20,11 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, - '200': { icon: 'icons/publicaffairs.svg', color: '#c757ff', bcolor: '#c757ff' }, - '200-201': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#0AB971' }, - '300': { icon: 'icons/financial-admin.svg', color:'' , bcolor:'' }, - '300-301': { icon: 'icons/financial-admin.svg', color: '#C75746', bcolor: '#4E6D00' }, - '400': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, + '200': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#c757ff' }, + '200-201': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, + '300': { icon: 'icons/financial-admin.svg', color:'#00bfff' , bcolor:'' }, + '300-301': { icon: 'icons/financial-admin.svg', color: '#00bfff', bcolor: '#4E6D00' }, + '400': { icon: 'icons/garbage.svg', color: '#00bfff6', bcolor: '#D33673' }, '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, '500': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, '500-501': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, From 1860694b203f247b1dd1d614a380201b57d4f10f Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 17:05:29 +0900 Subject: [PATCH 084/229] setting.js a --- js/setting.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/js/setting.js b/js/setting.js index 42561a2a..80c1d47a 100644 --- a/js/setting.js +++ b/js/setting.js @@ -24,23 +24,23 @@ OpenSpending.Styles.Cofog = { '200-201': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, '300': { icon: 'icons/financial-admin.svg', color:'#00bfff' , bcolor:'' }, '300-301': { icon: 'icons/financial-admin.svg', color: '#00bfff', bcolor: '#4E6D00' }, - '400': { icon: 'icons/garbage.svg', color: '#00bfff6', bcolor: '#D33673' }, - '400-401': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, - '500': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, - '500-501': { icon: 'icons/labour.svg', color: '#C75746', bcolor: '#2A3A03' }, - '600': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#EC2406' }, - '600-601': { icon: 'icons/fishing.svg', color: '#C75746', bcolor: '#EC2406' }, - '700': { icon: 'icons/economy-tourism.svg', color: '#C75746', bcolor: '#938626' }, - '700-701': { icon: 'icons/economy-tourism.svg', color: '#C75746', bcolor: '#938626' }, - '800': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, - '800-801': { icon: 'icons/coal.svg', color: '#C75746', bcolor: '#C75746' }, - '900': { icon: 'icons/fire-brigade.svg', color: '#C75746', bcolor: '#D33673' }, - '900-901': { icon: 'icons/fire-brigade.svg', color: '#C75746', bcolor: '#D33673' }, - '1000': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#790586' }, - '1000-1001': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#790586' }, - '1100': { icon: 'icons/dollar.svg', color: '#C75746', bcolor: '#D33673' }, - '1100-1101': { icon: 'icons/dollar.svg', color: '#C75746', bcolor: '#D33673' }, - '1200': { icon: 'icons/euro.svg', color: '#C75746', bcolor: '#D33673' }, - '1200-1201': { icon: 'icons/euro.svg', color: '#C75746', bcolor: '#D33673' } + '400': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' }, + '400-401': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' }, + '500': { icon: 'icons/labour.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '500-501': { icon: 'icons/labour.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '600': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, + '600-601': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, + '700': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, + '700-701': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, + '800': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, + '800-801': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, + '900': { icon: 'icons/fire-brigade.svg', color: '#C#00bfff', bcolor: '#D33673' }, + '900-901': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' }, + '1000': { icon: 'icons/education.svg', color: '#00bfff', bcolor: '#790586' }, + '1000-1001': { icon: 'icons/education.svg', color: '#00bfff', bcolor: '#790586' }, + '1100': { icon: 'icons/dollar.svg', color: '#00bfff', bcolor: '#D33673' }, + '1100-1101': { icon: 'icons/dollar.svg', color: '#00bfff', bcolor: '#D33673' }, + '1200': { icon: 'icons/euro.svg', color: '##00bfff', bcolor: '#D33673' }, + '1200-1201': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#D33673' } }; From dbb72070337f8857817b0e48bb3a0c95b363b1fb Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 17:29:02 +0900 Subject: [PATCH 085/229] dailybread.js a --- js/dailybread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/dailybread.js b/js/dailybread.js index fa7f2439..3bb441dc 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -194,7 +194,7 @@ OpenSpending.DailyBread = function (elem) { var iconUrl, paper; iconUrl = $(e).data('svg-url'); paper = Raphael(e, iconRad+iconRad,iconRad+iconRad+5); - paper.circle(iconRad,iconRad,iconRad).attr({ fill: '#830242', stroke: 'none' }); + paper.circle(iconRad,iconRad,iconRad).attr({ fill: '#00bfff', stroke: 'none' }); paper.circle(iconRad,iconRad,iconRad-2).attr({ fill: 'none', stroke: '#eee', opacity: .8, 'stroke-dasharray': '- ' }); $.get(iconUrl, function(svg) { if (typeof(svg) == "string") { From 56f33e4d50e636269a7558a3699dd7a058791e2b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 17:43:59 +0900 Subject: [PATCH 086/229] team.html a --- team.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/team.html b/team.html index ddf6aab1..00cfea0a 100644 --- a/team.html +++ b/team.html @@ -17,7 +17,7 @@

                Team 人材育成

                • 沖野　保志(Okino Yasushi), (Developer)
                • 蓬莱　大流(Hourai Masaru), (Developer)
                  • -
                • 藤中　紳之介(Fujinaka Shinnosuke), (Developer)
                  • +
                • 藤中　紳之介(Fujinaka Shinnosuke), (God)
                • 奥村　健也(Okumura Kenya), (Coordinator)
                • 高野　敦子(Takano Atsuko), (Adviser)
                From 75ba059e1ccab79f99a03be49c4fdd9dcb30ffbb Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 12 Dec 2014 17:45:26 +0900 Subject: [PATCH 087/229] team.html a --- team.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/team.html b/team.html index 00cfea0a..a97e6463 100644 --- a/team.html +++ b/team.html @@ -16,8 +16,8 @@

                Team 人材育成

                • 沖野　保志(Okino Yasushi), (Developer)
                  • -
                • 蓬莱　大流(Hourai Masaru), (Developer)
                  • -
                • 藤中　紳之介(Fujinaka Shinnosuke), (God)
                  • +
                • 蓬莱　大流(Hourai Masaru), (Syatiku Akuma God)
                  • +
                • 藤中　紳之介(Fujinaka Shinnosuke), (Developer)
                • 奥村　健也(Okumura Kenya), (Coordinator)
                • 高野　敦子(Takano Atsuko), (Adviser)
                From f756caa6e749f18adde8ac90699c89b8314a1b6d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 17 Dec 2014 11:06:38 +0900 Subject: [PATCH 088/229] team.html a --- team.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/team.html b/team.html index a97e6463..0a0cf91e 100644 --- a/team.html +++ b/team.html @@ -16,7 +16,7 @@

                Team 人材育成

                • 沖野　保志(Okino Yasushi), (Developer)
                  • -
                • 蓬莱　大流(Hourai Masaru), (Syatiku Akuma God)
                  • +
                • 蓬莱　大流(Hourai Masaru), (ブルーバード)
                • 藤中　紳之介(Fujinaka Shinnosuke), (Developer)
                • 奥村　健也(Okumura Kenya), (Coordinator)
                • 高野　敦子(Takano Atsuko), (Adviser)
                  • From 502bbf32cbb9c104b6e37fc4a2fdb8efcf59cf2d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 17 Dec 2014 11:19:31 +0900 Subject: [PATCH 089/229] dailybread.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ｚ --- js/dailybread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/dailybread.js b/js/dailybread.js index 3bb441dc..17d2c31d 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -44,7 +44,7 @@ OpenSpending.DailyBread = function (elem) { this.$e.find('.wdmmg-slider').slider({ value: this.salaryVal, min: 1000000, - max: 20000000, + max: 30000000, step: 1000, animate: true, slide: function () { self.sliderUpdated.apply(self, arguments) } From 109647d28134d2324a9a83e9babf58de693e2d8e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 17 Dec 2014 13:10:22 +0900 Subject: [PATCH 090/229] team.html a --- team.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/team.html b/team.html index 0a0cf91e..ddf6aab1 100644 --- a/team.html +++ b/team.html @@ -16,7 +16,7 @@

                  Team 人材育成

                  • 沖野　保志(Okino Yasushi), (Developer)
                    • -
                  • 蓬莱　大流(Hourai Masaru), (ブルーバード)
                    • +
                  • 蓬莱　大流(Hourai Masaru), (Developer)
                  • 藤中　紳之介(Fujinaka Shinnosuke), (Developer)
                  • 奥村　健也(Okumura Kenya), (Coordinator)
                  • 高野　敦子(Takano Atsuko), (Adviser)
                    • From 3bcdd754c863d7edcf1bb56f9faf7bb732d4ed22 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 17 Dec 2014 13:24:46 +0900 Subject: [PATCH 091/229] dailybread.js z --- js/dailybread.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/dailybread.js b/js/dailybread.js index 17d2c31d..8e27acba 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -44,8 +44,8 @@ OpenSpending.DailyBread = function (elem) { this.$e.find('.wdmmg-slider').slider({ value: this.salaryVal, min: 1000000, - max: 30000000, - step: 1000, + max: 20000000, + step: 10000, animate: true, slide: function () { self.sliderUpdated.apply(self, arguments) } }) From ba460d98dd637666f17bd696ac464e50efb8f0e2 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 24 Dec 2014 15:25:57 +0900 Subject: [PATCH 092/229] logo-kakogawa.png a --- img/logo-kakogawa.png | 1 + 1 file changed, 1 insertion(+) create mode 100644 img/logo-kakogawa.png diff --git a/img/logo-kakogawa.png b/img/logo-kakogawa.png new file mode 100644 index 00000000..78bc78a0 --- /dev/null +++ b/img/logo-kakogawa.png @@ -0,0 +1 @@ +logo-kakogawa.svg From 13e42fd88ef516a166fbc68f56e1f67262699009 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 24 Dec 2014 15:33:32 +0900 Subject: [PATCH 093/229] default.html a --- _layouts/default.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_layouts/default.html b/_layouts/default.html index d03194ff..c8ef9eb4 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -26,6 +26,7 @@ From 55b8859e7bb92cb1cee016599640e481334d0046 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 14 Jan 2015 14:35:59 +0900 Subject: [PATCH 106/229] default.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- _layouts/default.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_layouts/default.html b/_layouts/default.html index 653fb72a..a1a95a71 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -28,6 +28,7 @@

                    Kakogawa City

                    {{ site.title }} +
                    あなたが加古川市に納めた税金がどこで使われているかをお示しします
                    From df1f2db936e1a65441928afd75c820ce0e3cc04b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 14 Jan 2015 14:47:50 +0900 Subject: [PATCH 107/229] kakogawa.svg a --- img/kakogawa.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 img/kakogawa.svg diff --git a/img/kakogawa.svg b/img/kakogawa.svg new file mode 100644 index 00000000..81cec0fb --- /dev/null +++ b/img/kakogawa.svg @@ -0,0 +1 @@ +113px-Emblem_of_Kakogawa,_Hyogo.svg From a58ab821a864de2565d5f69d4ec221dcb82da1d8 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 14 Jan 2015 15:30:01 +0900 Subject: [PATCH 108/229] default.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit あ --- _layouts/default.html | 1 - 1 file changed, 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index a1a95a71..653fb72a 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -28,7 +28,6 @@

                    Kakogawa City

                    {{ site.title }} -
                    あなたが加古川市に納めた税金がどこで使われているかをお示しします
                    From 05fa0332fe7a72c5158af9a75066f849bffe6ce0 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 29 Jan 2015 14:04:39 +0900 Subject: [PATCH 109/229] team.html a --- team.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/team.html b/team.html index ddf6aab1..6bae05af 100644 --- a/team.html +++ b/team.html @@ -16,7 +16,7 @@

                    Team 人材育成

                    • 沖野　保志(Okino Yasushi), (Developer)
                      • -
                    • 蓬莱　大流(Hourai Masaru), (Developer)
                      • +
                    • 蓬莱　大流(Hourai Masaru), (super Coordinator)
                    • 藤中　紳之介(Fujinaka Shinnosuke), (Developer)
                    • 奥村　健也(Okumura Kenya), (Coordinator)
                    • 高野　敦子(Takano Atsuko), (Adviser)
                      • From 833c8575bc878f717bf96a038bdd18104bc3129c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 29 Jan 2015 14:07:47 +0900 Subject: [PATCH 110/229] team.html a --- team.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/team.html b/team.html index 6bae05af..ddf6aab1 100644 --- a/team.html +++ b/team.html @@ -16,7 +16,7 @@

                      Team 人材育成

                      • 沖野　保志(Okino Yasushi), (Developer)
                        • -
                      • 蓬莱　大流(Hourai Masaru), (super Coordinator)
                        • +
                      • 蓬莱　大流(Hourai Masaru), (Developer)
                      • 藤中　紳之介(Fujinaka Shinnosuke), (Developer)
                      • 奥村　健也(Okumura Kenya), (Coordinator)
                      • 高野　敦子(Takano Atsuko), (Adviser)
                        • From 634f21317da2b1980a733c04d7d9d375bdcb6e1f Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 11 Mar 2015 13:11:09 +0900 Subject: [PATCH 111/229] dailybread.css q --- css/dailybread.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/dailybread.css b/css/dailybread.css index b7eaf86b..d3b1ef9e 100644 --- a/css/dailybread.css +++ b/css/dailybread.css @@ -31,7 +31,7 @@ } #db-header h1 { - color: #00bfff; + color: #ooffff; font-size: 2.5em; text-transform: uppercase; } From 46aa79fcf76e580c3c6f496cdc29278df886cfa3 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 11 Mar 2015 13:13:16 +0900 Subject: [PATCH 112/229] dailybread.css a --- css/dailybread.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/dailybread.css b/css/dailybread.css index d3b1ef9e..0d8430a7 100644 --- a/css/dailybread.css +++ b/css/dailybread.css @@ -31,7 +31,7 @@ } #db-header h1 { - color: #ooffff; + color: #00ffff; font-size: 2.5em; text-transform: uppercase; } From 227c6feab5f08fa2d2620d66f08595902af456a3 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 11 Mar 2015 13:14:20 +0900 Subject: [PATCH 113/229] dailybread.css a --- css/dailybread.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/dailybread.css b/css/dailybread.css index 0d8430a7..1c1d6ac8 100644 --- a/css/dailybread.css +++ b/css/dailybread.css @@ -31,7 +31,7 @@ } #db-header h1 { - color: #00ffff; + color: #6600ff; font-size: 2.5em; text-transform: uppercase; } From 9a672a8791ffa9dc888eb9f66d2bf1d1c604f0b4 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 11 Mar 2015 13:18:45 +0900 Subject: [PATCH 114/229] dailybread.js a --- js/dailybread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/dailybread.js b/js/dailybread.js index 8e27acba..2042ea2e 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -233,7 +233,7 @@ OpenSpending.renderDependentTypes = function(db) { $(target).bind('click', handleClick); var r = Raphael(target, iconRad * 2, iconRad * 2 + 5); - r.circle(iconRad,iconRad,iconRad).attr({ fill: '#00bfff', stroke: 'none' }); + r.circle(iconRad,iconRad,iconRad).attr({ fill: '#00ffff', stroke: 'none' }); r.circle(iconRad,iconRad,iconRad-2).attr({ fill: 'none', stroke: '#eee', opacity: .8, 'stroke-dasharray': '- ' }); $.get(iconPath, function(svg) { if (typeof(svg) == "string") { From 46453f3fc07f2217e4f0ab506b21d581c5de18de Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 11 Mar 2015 13:20:16 +0900 Subject: [PATCH 115/229] dailybread.js x --- js/dailybread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/dailybread.js b/js/dailybread.js index 2042ea2e..d9bd1916 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -194,7 +194,7 @@ OpenSpending.DailyBread = function (elem) { var iconUrl, paper; iconUrl = $(e).data('svg-url'); paper = Raphael(e, iconRad+iconRad,iconRad+iconRad+5); - paper.circle(iconRad,iconRad,iconRad).attr({ fill: '#00bfff', stroke: 'none' }); + paper.circle(iconRad,iconRad,iconRad).attr({ fill: '#6600ff', stroke: 'none' }); paper.circle(iconRad,iconRad,iconRad-2).attr({ fill: 'none', stroke: '#eee', opacity: .8, 'stroke-dasharray': '- ' }); $.get(iconUrl, function(svg) { if (typeof(svg) == "string") { From efdd5bfba73a00713f1c8ce74e45b60dc09ededd Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 12 Mar 2015 14:00:02 +0900 Subject: [PATCH 116/229] dailybread.js --- js/dailybread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/dailybread.js b/js/dailybread.js index d9bd1916..2042ea2e 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -194,7 +194,7 @@ OpenSpending.DailyBread = function (elem) { var iconUrl, paper; iconUrl = $(e).data('svg-url'); paper = Raphael(e, iconRad+iconRad,iconRad+iconRad+5); - paper.circle(iconRad,iconRad,iconRad).attr({ fill: '#6600ff', stroke: 'none' }); + paper.circle(iconRad,iconRad,iconRad).attr({ fill: '#00bfff', stroke: 'none' }); paper.circle(iconRad,iconRad,iconRad-2).attr({ fill: 'none', stroke: '#eee', opacity: .8, 'stroke-dasharray': '- ' }); $.get(iconUrl, function(svg) { if (typeof(svg) == "string") { From 6cadfe1c0c113db24bd1ee26925d359c09766133 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 26 Mar 2015 14:02:23 +0900 Subject: [PATCH 117/229] team.html --- team.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/team.html b/team.html index ddf6aab1..db862957 100644 --- a/team.html +++ b/team.html @@ -16,8 +16,9 @@

                        Team 人材育成

                        • 沖野　保志(Okino Yasushi), (Developer)
                          • -
                        • 蓬莱　大流(Hourai Masaru), (Developer)
                          • +
                        • 蓬莱　大流(Horai Masaru), (Developer)
                        • 藤中　紳之介(Fujinaka Shinnosuke), (Developer)
                          • +
                        • 泉谷　幸佑(Izutani Kosuke), (Developer)
                        • 奥村　健也(Okumura Kenya), (Coordinator)
                        • 高野　敦子(Takano Atsuko), (Adviser)
                        From 41288b6156192e11a184d0740d5b94d4228aa97d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 26 Mar 2015 14:52:46 +0900 Subject: [PATCH 118/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 80c1d47a..5c47fd0d 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'jinzai2014ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 501dc761d38e74caef14eb01113e513d9e2797bb Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 1 Apr 2015 16:08:34 +0900 Subject: [PATCH 119/229] setting.js 1 --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 5c47fd0d..6fe974e0 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2014ikusei'; +OpenSpending.identifier = 'jinzai2016ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 0d24bd070c9b7a9a381dc59cf626d11db3b65408 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 2 Apr 2015 13:38:15 +0900 Subject: [PATCH 120/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 6fe974e0..659f709a 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2016ikusei'; +OpenSpending.identifier = 'jinzai2017ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 03b1ebbd86a005cf5126c08cd4c5037a055101a5 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 2 Apr 2015 16:54:55 +0900 Subject: [PATCH 121/229] setting.js a --- js/setting.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/js/setting.js b/js/setting.js index 659f709a..edb363e5 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,17 +18,17 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, - '100-101': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, - '200': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#c757ff' }, - '200-201': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, - '300': { icon: 'icons/financial-admin.svg', color:'#00bfff' , bcolor:'' }, - '300-301': { icon: 'icons/financial-admin.svg', color: '#00bfff', bcolor: '#4E6D00' }, - '400': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' }, - '400-401': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' }, - '500': { icon: 'icons/labour.svg', color: '#00bfff', bcolor: '#2A3A03' }, - '500-501': { icon: 'icons/labour.svg', color: '#00bfff', bcolor: '#2A3A03' }, - '600': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, + '1000': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, + '1000-1100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, + '2000': { icon: 'icons/family2.svg', color: '#00bfff', bcolor: '#c757ff' }, + '2000-2100': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, + '2100-2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, + '2100-2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, + '2100-2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, + '2000-2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, + '2000-2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '3000': { icon: 'icons/unenployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '3000-3100': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, '600-601': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, '700': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, '700-701': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, @@ -36,10 +36,10 @@ OpenSpending.Styles.Cofog = { '800-801': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, '900': { icon: 'icons/fire-brigade.svg', color: '#C#00bfff', bcolor: '#D33673' }, '900-901': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' }, - '1000': { icon: 'icons/education.svg', color: '#00bfff', bcolor: '#790586' }, + '1000-1001': { icon: 'icons/education.svg', color: '#00bfff', bcolor: '#790586' }, '1100': { icon: 'icons/dollar.svg', color: '#00bfff', bcolor: '#D33673' }, - '1100-1101': { icon: 'icons/dollar.svg', color: '#00bfff', bcolor: '#D33673' }, + '1200': { icon: 'icons/euro.svg', color: '##00bfff', bcolor: '#D33673' }, '1200-1201': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#D33673' } }; From c67d1bc5305abff61d0ed4cdf9a81e0039615065 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 2 Apr 2015 16:56:24 +0900 Subject: [PATCH 122/229] setting.js a --- js/setting.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/setting.js b/js/setting.js index edb363e5..bd6406fa 100644 --- a/js/setting.js +++ b/js/setting.js @@ -21,12 +21,12 @@ OpenSpending.Styles.Cofog = { '1000': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '1000-1100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '2000': { icon: 'icons/family2.svg', color: '#00bfff', bcolor: '#c757ff' }, - '2000-2100': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, + '2100': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, '2100-2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, '2100-2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, '2100-2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, - '2000-2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, - '2000-2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, + '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000': { icon: 'icons/unenployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000-3100': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, '600-601': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, From df6f930bc360b7d297f17921b9bcd7bc2d02fb99 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Apr 2015 18:40:19 +0900 Subject: [PATCH 123/229] aggregator.js --- js/aggregator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/aggregator.js b/js/aggregator.js index 26cf7a9b..9eee75a5 100644 --- a/js/aggregator.js +++ b/js/aggregator.js @@ -72,7 +72,7 @@ var OpenSpending = OpenSpending || {}; return config.localApiCache; } apiUrl = config.apiUrl || config.siteUrl + '/api'; - return apiUrl + '/2/aggregate'; + return apiUrl + '/3/aggregate'; }; /** From a83e54e6483c71b16894a68a99bb105c9e84dfab Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Apr 2015 18:44:53 +0900 Subject: [PATCH 124/229] setting.js --- js/setting.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index bd6406fa..613b7d82 100644 --- a/js/setting.js +++ b/js/setting.js @@ -36,10 +36,8 @@ OpenSpending.Styles.Cofog = { '800-801': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, '900': { icon: 'icons/fire-brigade.svg', color: '#C#00bfff', bcolor: '#D33673' }, '900-901': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' }, - '1000-1001': { icon: 'icons/education.svg', color: '#00bfff', bcolor: '#790586' }, '1100': { icon: 'icons/dollar.svg', color: '#00bfff', bcolor: '#D33673' }, - '1200': { icon: 'icons/euro.svg', color: '##00bfff', bcolor: '#D33673' }, '1200-1201': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#D33673' } }; From 390ca871488a0fdb77bf62bada45c37a0a7ea913 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Apr 2015 18:47:44 +0900 Subject: [PATCH 125/229] aggregator.js --- js/aggregator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/aggregator.js b/js/aggregator.js index 9eee75a5..26cf7a9b 100644 --- a/js/aggregator.js +++ b/js/aggregator.js @@ -72,7 +72,7 @@ var OpenSpending = OpenSpending || {}; return config.localApiCache; } apiUrl = config.apiUrl || config.siteUrl + '/api'; - return apiUrl + '/3/aggregate'; + return apiUrl + '/2/aggregate'; }; /** From a5ffc61ddf7e026dd2f5f014a1af1776ae741c5a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Apr 2015 18:54:22 +0900 Subject: [PATCH 126/229] setting.js a --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 613b7d82..8608e6ee 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2017ikusei'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 09f7016efca36ca0bcfdb3c70f5e666435c6e12d Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Apr 2015 19:04:58 +0900 Subject: [PATCH 127/229] aggregator.js --- js/aggregator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/aggregator.js b/js/aggregator.js index 26cf7a9b..9eee75a5 100644 --- a/js/aggregator.js +++ b/js/aggregator.js @@ -72,7 +72,7 @@ var OpenSpending = OpenSpending || {}; return config.localApiCache; } apiUrl = config.apiUrl || config.siteUrl + '/api'; - return apiUrl + '/2/aggregate'; + return apiUrl + '/3/aggregate'; }; /** From cba0b3d5a0623782b824325d346d051fe1e195e4 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Apr 2015 19:06:37 +0900 Subject: [PATCH 128/229] aggregator.js --- js/aggregator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/aggregator.js b/js/aggregator.js index 9eee75a5..26cf7a9b 100644 --- a/js/aggregator.js +++ b/js/aggregator.js @@ -72,7 +72,7 @@ var OpenSpending = OpenSpending || {}; return config.localApiCache; } apiUrl = config.apiUrl || config.siteUrl + '/api'; - return apiUrl + '/3/aggregate'; + return apiUrl + '/2/aggregate'; }; /** From ff8f10e4bd6cdc332e47364c209862fb3f8156c4 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Apr 2015 23:54:52 +0900 Subject: [PATCH 129/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 8608e6ee..613b7d82 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'jinzai2017ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 2ee071424928de670860dd482142699652edfe66 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 4 Apr 2015 10:51:17 +0900 Subject: [PATCH 130/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 613b7d82..8608e6ee 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2017ikusei'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 3f8fd8e41593d9674b7324b58d649f0df893d222 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 7 Apr 2015 12:59:25 +0900 Subject: [PATCH 131/229] setting.js --- js/setting.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/setting.js b/js/setting.js index 8608e6ee..32d3cf4a 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2012ikusei'; +OpenSpending.identifier = 'jinzai2017ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; @@ -19,12 +19,12 @@ OpenSpending.Styles.Cofog = { /* yokohama cofog */ '1000': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, - '1000-1100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, + '1100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '2000': { icon: 'icons/family2.svg', color: '#00bfff', bcolor: '#c757ff' }, '2100': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, - '2100-2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, - '2100-2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, - '2100-2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, + '2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, + '2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, + '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000': { icon: 'icons/unenployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, From 1d58d6aeee22bacb7d7bce9cadbea30caea0ca68 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 7 Apr 2015 13:06:03 +0900 Subject: [PATCH 132/229] setting.js --- js/setting.js | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/js/setting.js b/js/setting.js index 32d3cf4a..b228a4b8 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,27 +18,31 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '1000': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, - '1100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, - '2000': { icon: 'icons/family2.svg', color: '#00bfff', bcolor: '#c757ff' }, - '2100': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, - '2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, - '2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, - '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, - '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, - '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, - '3000': { icon: 'icons/unenployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, - '3000-3100': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, - '600-601': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, - '700': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, - '700-701': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, - '800': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, - '800-801': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, - '900': { icon: 'icons/fire-brigade.svg', color: '#C#00bfff', bcolor: '#D33673' }, - '900-901': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' }, - '1000-1001': { icon: 'icons/education.svg', color: '#00bfff', bcolor: '#790586' }, - '1100': { icon: 'icons/dollar.svg', color: '#00bfff', bcolor: '#D33673' }, - '1200': { icon: 'icons/euro.svg', color: '##00bfff', bcolor: '#D33673' }, - '1200-1201': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#D33673' } + '1': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, + '1-1': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, + '2': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, + '2-1': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, + '2-2': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#0AB971' }, + '3': { icon: 'icons/economy-tourism.svg', color: '#C75746', bcolor: '#4E6D00' }, + '3-1': { icon: 'icons/dollar.svg', color: '#C75746', bcolor: '#4E6D00' }, + '3-2': { icon: 'icons/harbor.svg', color: '#C75746', bcolor: '#4E6D00' }, + '3-3': { icon: 'icons/culture.svg', color: '#C75746', bcolor: '#4E6D00' }, + '4': { icon: 'icons/our-streets.svg', color: '#C75746', bcolor: '#D33673' }, + '4-1': { icon: 'icons/farms.svg', color: '#C75746', bcolor: '#D33673' }, + '4-2': { icon: 'icons/street-lights.svg', color: '#C75746', bcolor: '#D33673' }, + '4-3': { icon: 'icons/housing.svg', color: '#C75746', bcolor: '#D33673' }, + '5': { icon: 'icons/environment.svg', color: '#C75746', bcolor: '#2A3A03' }, + '5-1': { icon: 'icons/tree.svg', color: '#C75746', bcolor: '#2A3A03' }, + '5-2': { icon: 'icons/wind.svg', color: '#C75746', bcolor: '#2A3A03' }, + '6': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, + '6-1': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, + '7': { icon: 'icons/traffic-watersup.svg', color: '#C75746', bcolor: '#938626' }, + '7-1': { icon: 'icons/traffic-watersup.svg', color: '#C75746', bcolor: '#938626' }, + '8': { icon: 'icons/government.svg', color: '#C75746', bcolor: '#C75746' }, + '8-1': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#C75746' }, + '8-2': { icon: 'icons/government.svg', color: '#C75746', bcolor: '#C75746' }, + '9': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, + '9-1': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, + '10': { icon: 'icons/order-safety.svg', color: '#C75746', bcolor: '#790586' }, + '10-1': { icon: 'icons/order-safety.svg', color: '#C75746', bcolor: '#790586' } }; - From 6488c072fdf8c2910dfc0e806c31dd66700d6643 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 7 Apr 2015 13:32:00 +0900 Subject: [PATCH 133/229] index.html --- index.html | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index f9a45147..b41e9a26 100644 --- a/index.html +++ b/index.html @@ -31,14 +31,31 @@ apiUrl: 'http://openspending.org/api', //localApiCache: 'aggregate.json', dataset: OpenSpending.identifier, - drilldowns: ['Category', 'Subcategory'], + drilldowns: ['Category', 'Subcategory', 'Subcategory02'], cuts: ['year:' + OpenSpending.year], rootNodeLabel: 'Total', - breakdown: 'Subcategory', + breakdown: 'Subcategory02', callback: function(data) { $('#content-wrap').show(); $('#preloader').remove(); + var work = {}; + var i; + var n = 9; + var j; + console.log(data); + for(i=0;i< n-1;i++){ + for(j=n-1;j>i;j--){ + if(data.children[j-1]["amount"] Date: Tue, 7 Apr 2015 13:34:41 +0900 Subject: [PATCH 134/229] bubbletree.html --- bubbletree.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bubbletree.html b/bubbletree.html index ee229a38..75cf2366 100644 --- a/bubbletree.html +++ b/bubbletree.html @@ -54,9 +54,9 @@ //localApiCache: 'aggregate.json', dataset: OpenSpending.identifier, rootNodeLabel: 'Total', - drilldowns: ['Category', 'Subcategory'], + drilldowns: ['Category', 'Subcategory', 'Subcategory02'], cuts: ['year:' + OpenSpending.year], - breakdown: 'Subcategory', + breakdown: 'Subcategory02', callback: dataLoaded }); }); From 8753ffb72a24697105e38ed87a5a1f5ac6351cc8 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 7 Apr 2015 13:47:44 +0900 Subject: [PATCH 135/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index b228a4b8..bb7ab17a 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2017ikusei'; +OpenSpending.identifier = 'jinzai2017'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 510389fb70b163c7b78af22a82302675f8255aba Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 7 Apr 2015 13:49:18 +0900 Subject: [PATCH 136/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index bb7ab17a..8d70e04d 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2017'; +OpenSpending.identifier = 'jinzai2014ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 5e1d484ad8ab1d6c5cd35120e9b60c33833a1aa8 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 7 Apr 2015 14:00:59 +0900 Subject: [PATCH 137/229] aggregator.js --- js/aggregator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/aggregator.js b/js/aggregator.js index 26cf7a9b..4d77e741 100644 --- a/js/aggregator.js +++ b/js/aggregator.js @@ -72,7 +72,7 @@ var OpenSpending = OpenSpending || {}; return config.localApiCache; } apiUrl = config.apiUrl || config.siteUrl + '/api'; - return apiUrl + '/2/aggregate'; + return apiUrl + '/2/aggregate'; }; /** From c9e05d67401353a4e62c63731b8c7dd17beafe38 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 8 Apr 2015 14:54:59 +0900 Subject: [PATCH 138/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 8d70e04d..1ae1b841 100644 --- a/js/setting.js +++ b/js/setting.js @@ -10,7 +10,7 @@ Taxes.taxRate = 0.06; // 住民税率 var OpenSpending = OpenSpending || {}; -OpenSpending.identifier = 'jinzai2014ikusei'; +OpenSpending.identifier = 'jinzai2012ikusei'; OpenSpending.year = '2014'; OpenSpending.Styles = OpenSpending.Styles || {}; From 2968a515d91abadf9e0ebd8bf2842e811c4a8c24 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 8 Apr 2015 15:03:30 +0900 Subject: [PATCH 139/229] setting.js --- js/setting.js | 50 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/js/setting.js b/js/setting.js index 1ae1b841..b7f2dcad 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,31 +18,27 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '1': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, - '1-1': { icon: 'icons/helping-others.svg', color: '#C75746', bcolor: '#935B3B' }, - '2': { icon: 'icons/schools.svg', color: '#C75746', bcolor: '#0AB971' }, - '2-1': { icon: 'icons/pre-school.svg', color: '#C75746', bcolor: '#0AB971' }, - '2-2': { icon: 'icons/education.svg', color: '#C75746', bcolor: '#0AB971' }, - '3': { icon: 'icons/economy-tourism.svg', color: '#C75746', bcolor: '#4E6D00' }, - '3-1': { icon: 'icons/dollar.svg', color: '#C75746', bcolor: '#4E6D00' }, - '3-2': { icon: 'icons/harbor.svg', color: '#C75746', bcolor: '#4E6D00' }, - '3-3': { icon: 'icons/culture.svg', color: '#C75746', bcolor: '#4E6D00' }, - '4': { icon: 'icons/our-streets.svg', color: '#C75746', bcolor: '#D33673' }, - '4-1': { icon: 'icons/farms.svg', color: '#C75746', bcolor: '#D33673' }, - '4-2': { icon: 'icons/street-lights.svg', color: '#C75746', bcolor: '#D33673' }, - '4-3': { icon: 'icons/housing.svg', color: '#C75746', bcolor: '#D33673' }, - '5': { icon: 'icons/environment.svg', color: '#C75746', bcolor: '#2A3A03' }, - '5-1': { icon: 'icons/tree.svg', color: '#C75746', bcolor: '#2A3A03' }, - '5-2': { icon: 'icons/wind.svg', color: '#C75746', bcolor: '#2A3A03' }, - '6': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, - '6-1': { icon: 'icons/civilian-action.svg', color: '#C75746', bcolor: '#EC2406' }, - '7': { icon: 'icons/traffic-watersup.svg', color: '#C75746', bcolor: '#938626' }, - '7-1': { icon: 'icons/traffic-watersup.svg', color: '#C75746', bcolor: '#938626' }, - '8': { icon: 'icons/government.svg', color: '#C75746', bcolor: '#C75746' }, - '8-1': { icon: 'icons/publicaffairs.svg', color: '#C75746', bcolor: '#C75746' }, - '8-2': { icon: 'icons/government.svg', color: '#C75746', bcolor: '#C75746' }, - '9': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, - '9-1': { icon: 'icons/garbage.svg', color: '#C75746', bcolor: '#D33673' }, - '10': { icon: 'icons/order-safety.svg', color: '#C75746', bcolor: '#790586' }, - '10-1': { icon: 'icons/order-safety.svg', color: '#C75746', bcolor: '#790586' } + '1000': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, + '1100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, + '2000': { icon: 'icons/family2.svg', color: '#00bfff', bcolor: '#c757ff' }, + '2100': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, + '2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, + '2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, + '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, + '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, + '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '3000': { icon: 'icons/unenployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '3000-3100': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, + '600-601': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, + '700': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, + '700-701': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, + '800': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, + '800-801': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, + '900': { icon: 'icons/fire-brigade.svg', color: '#C#00bfff', bcolor: '#D33673' }, + '900-901': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' }, + '1000-1001': { icon: 'icons/education.svg', color: '#00bfff', bcolor: '#790586' }, + '1100': { icon: 'icons/dollar.svg', color: '#00bfff', bcolor: '#D33673' }, + '1200': { icon: 'icons/euro.svg', color: '##00bfff', bcolor: '#D33673' }, + '1200-1201': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#D33673' } }; + From 0949f21914eff0bef7f7234d42fecd635c680e39 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 15 Apr 2015 16:46:12 +0900 Subject: [PATCH 140/229] setting.js --- js/setting.js | 63 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 12 deletions(-) diff --git a/js/setting.js b/js/setting.js index b7f2dcad..9d30a2eb 100644 --- a/js/setting.js +++ b/js/setting.js @@ -28,17 +28,56 @@ OpenSpending.Styles.Cofog = { '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000': { icon: 'icons/unenployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, - '3000-3100': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, - '600-601': { icon: 'icons/fishing.svg', color: '#00bfff', bcolor: '#EC2406' }, - '700': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, - '700-701': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#938626' }, - '800': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, - '800-801': { icon: 'icons/coal.svg', color: '#00bfff', bcolor: '#C75746' }, - '900': { icon: 'icons/fire-brigade.svg', color: '#C#00bfff', bcolor: '#D33673' }, - '900-901': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' }, - '1000-1001': { icon: 'icons/education.svg', color: '#00bfff', bcolor: '#790586' }, - '1100': { icon: 'icons/dollar.svg', color: '#00bfff', bcolor: '#D33673' }, - '1200': { icon: 'icons/euro.svg', color: '##00bfff', bcolor: '#D33673' }, - '1200-1201': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#D33673' } + '3100': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#EC2406' }, + '3101': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#EC2406' }, + '3102': { icon: 'icons/secondary-lower.svg', color: '#00bfff', bcolor: '#938626' }, + '3103': { icon: 'icons/preschool.svg', color: '#00bfff', bcolor: '#938626' }, + '3104': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#C75746' }, + '3105': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#C75746' }, + '3106': { icon: 'icons/helping-others.svg', color: '#C#00bfff', bcolor: '#D33673' }, + '3107': { icon: 'icons/foreign-military-aid.svg', color: '#00bfff', bcolor: '#D33673' }, + '3108': { icon: 'icons/pig.svg', color: '#00bfff', bcolor: '#790586' }, + '3109': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' }, + '3110': { icon: 'icons/housingo.svg', color: '##00bfff', bcolor: '#D33673' }, + '3200': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' } + '3300': { icon: 'icons/railways.svg', color: '#00bfff', bcolor: '#D33673' } + '4000': { icon: 'icons/environment.svg', color: '#00bfff', bcolor: '#D33673' } + '4100': { icon: 'icons/farms.svg', color: '#00bfff', bcolor: '#D33673' } + '4101': { icon: 'icons/hospital.svg', color: '#00bfff', bcolor: '#D33673' } + '4102': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '4103': { icon: 'icons/hospital-specialized.svg', color: '#00bfff', bcolor: '#D33673' } + '4104': { icon: 'icons/health.svg', color: '#00bfff', bcolor: '#D33673' } + '4105': { icon: 'icons/unknown.svg', color: '#00bfff', bcolor: '#D33673' } + '4106': { icon: 'icons/nuclear.svg', color: '#00bfff', bcolor: '#D33673' } + '4200': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' } + '4201': { icon: 'icons/waste.svg', color: '#00bfff', bcolor: '#D33673' } + '4202': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' } + '4203': { icon: 'icons/island.svg', color: '#00bfff', bcolor: '#D33673' } + '4204': { icon: 'icons/toilet.svg', color: '#00bfff', bcolor: '#D33673' } + '5000': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' } + '5100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' } + '6000': { icon: 'icons/manufactorung-construction.svg', color: '#00bfff', bcolor: '#D33673' } + '6100': { icon: 'icons/forest.svg', color: '#00bfff', bcolor: '#D33673' } + '6101': { icon: 'icons/environment.svg', color: '#00bfff', bcolor: '#D33673' } + '6102': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' } + '6103': { icon: 'icons/pablicaffairs.svg', color: '#00bfff', bcolor: '#D33673' } + '6104': { icon: 'icons/pig.svg', color: '#00bfff', bcolor: '#D33673' } + '6200': { icon: 'icons/social-systems.svg', color: '#00bfff', bcolor: '#D33673' } + '6300': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6500': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#D33673' } + '6501': { icon: 'icons/misc-services.svg', color: '#00bfff', bcolor: '#D33673' } + '6502': { icon: 'icons/transport.svg', color: '#00bfff', bcolor: '#D33673' } + '7000': { icon: 'icons/our-streets.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } }; From e797129bf0366b220fe065c882cc389cda7e4bfe Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 15 Apr 2015 17:01:22 +0900 Subject: [PATCH 141/229] setting.js --- js/setting.js | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/js/setting.js b/js/setting.js index 9d30a2eb..dd9990ee 100644 --- a/js/setting.js +++ b/js/setting.js @@ -69,15 +69,23 @@ OpenSpending.Styles.Cofog = { '6501': { icon: 'icons/misc-services.svg', color: '#00bfff', bcolor: '#D33673' } '6502': { icon: 'icons/transport.svg', color: '#00bfff', bcolor: '#D33673' } '7000': { icon: 'icons/our-streets.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '7100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' } + '7101': { icon: 'icons/electricity.svg', color: '#00bfff', bcolor: '#D33673' } + '7102': { icon: 'icons/reilways.svg', color: '#00bfff', bcolor: '#D33673' } + '7103': { icon: 'icons/street-lights.svg', color: '#00bfff', bcolor: '#D33673' } + '7104': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' } + '7200': { icon: 'icons/traffic-watersup.svg', color: '#00bfff', bcolor: '#D33673' } + '7201': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '7202': { icon: 'icons/harbor.svg', color: '#00bfff', bcolor: '#D33673' } + '7203': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '7204': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } + '8000': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' } + '8100': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' } + '8200': { icon: 'icons/order-safety.svg', color: '#00bfff', bcolor: '#D33673' } + '9000': { icon: 'icons/schools.svg', color: '#00bfff', bcolor: '#D33673' } + '9100': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' } + '9101': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' } + '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' } + }; From 6643be1c99542af3bc4ec87625a385bef5ae8524 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 15 Apr 2015 17:04:09 +0900 Subject: [PATCH 142/229] setting.js --- js/setting.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index dd9990ee..b1de3c18 100644 --- a/js/setting.js +++ b/js/setting.js @@ -86,6 +86,4 @@ OpenSpending.Styles.Cofog = { '9100': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' } '9101': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' } '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' } - }; - From f5b91b9b2204d238116b86d71e6cad02456d94e8 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 15 Apr 2015 17:13:05 +0900 Subject: [PATCH 143/229] setting.js --- js/setting.js | 94 +++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/js/setting.js b/js/setting.js index b1de3c18..049af969 100644 --- a/js/setting.js +++ b/js/setting.js @@ -39,51 +39,51 @@ OpenSpending.Styles.Cofog = { '3108': { icon: 'icons/pig.svg', color: '#00bfff', bcolor: '#790586' }, '3109': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' }, '3110': { icon: 'icons/housingo.svg', color: '##00bfff', bcolor: '#D33673' }, - '3200': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' } - '3300': { icon: 'icons/railways.svg', color: '#00bfff', bcolor: '#D33673' } - '4000': { icon: 'icons/environment.svg', color: '#00bfff', bcolor: '#D33673' } - '4100': { icon: 'icons/farms.svg', color: '#00bfff', bcolor: '#D33673' } - '4101': { icon: 'icons/hospital.svg', color: '#00bfff', bcolor: '#D33673' } - '4102': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '4103': { icon: 'icons/hospital-specialized.svg', color: '#00bfff', bcolor: '#D33673' } - '4104': { icon: 'icons/health.svg', color: '#00bfff', bcolor: '#D33673' } - '4105': { icon: 'icons/unknown.svg', color: '#00bfff', bcolor: '#D33673' } - '4106': { icon: 'icons/nuclear.svg', color: '#00bfff', bcolor: '#D33673' } - '4200': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' } - '4201': { icon: 'icons/waste.svg', color: '#00bfff', bcolor: '#D33673' } - '4202': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' } - '4203': { icon: 'icons/island.svg', color: '#00bfff', bcolor: '#D33673' } - '4204': { icon: 'icons/toilet.svg', color: '#00bfff', bcolor: '#D33673' } - '5000': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' } - '5100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' } - '6000': { icon: 'icons/manufactorung-construction.svg', color: '#00bfff', bcolor: '#D33673' } - '6100': { icon: 'icons/forest.svg', color: '#00bfff', bcolor: '#D33673' } - '6101': { icon: 'icons/environment.svg', color: '#00bfff', bcolor: '#D33673' } - '6102': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' } - '6103': { icon: 'icons/pablicaffairs.svg', color: '#00bfff', bcolor: '#D33673' } - '6104': { icon: 'icons/pig.svg', color: '#00bfff', bcolor: '#D33673' } - '6200': { icon: 'icons/social-systems.svg', color: '#00bfff', bcolor: '#D33673' } - '6300': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' } - '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '6500': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#D33673' } - '6501': { icon: 'icons/misc-services.svg', color: '#00bfff', bcolor: '#D33673' } - '6502': { icon: 'icons/transport.svg', color: '#00bfff', bcolor: '#D33673' } - '7000': { icon: 'icons/our-streets.svg', color: '#00bfff', bcolor: '#D33673' } - '7100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' } - '7101': { icon: 'icons/electricity.svg', color: '#00bfff', bcolor: '#D33673' } - '7102': { icon: 'icons/reilways.svg', color: '#00bfff', bcolor: '#D33673' } - '7103': { icon: 'icons/street-lights.svg', color: '#00bfff', bcolor: '#D33673' } - '7104': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' } - '7200': { icon: 'icons/traffic-watersup.svg', color: '#00bfff', bcolor: '#D33673' } - '7201': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '7202': { icon: 'icons/harbor.svg', color: '#00bfff', bcolor: '#D33673' } - '7203': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '7204': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' } - '8000': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' } - '8100': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' } - '8200': { icon: 'icons/order-safety.svg', color: '#00bfff', bcolor: '#D33673' } - '9000': { icon: 'icons/schools.svg', color: '#00bfff', bcolor: '#D33673' } - '9100': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' } - '9101': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' } - '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' } + '3200': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' }, + '3300': { icon: 'icons/railways.svg', color: '#00bfff', bcolor: '#D33673' }, + '4000': { icon: 'icons/environment.svg', color: '#00bfff', bcolor: '#D33673' }, + '4100': { icon: 'icons/farms.svg', color: '#00bfff', bcolor: '#D33673' }, + '4101': { icon: 'icons/hospital.svg', color: '#00bfff', bcolor: '#D33673' }, + '4102': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, + '4103': { icon: 'icons/hospital-specialized.svg', color: '#00bfff', bcolor: '#D33673' }, + '4104': { icon: 'icons/health.svg', color: '#00bfff', bcolor: '#D33673' }, + '4105': { icon: 'icons/unknown.svg', color: '#00bfff', bcolor: '#D33673' }, + '4106': { icon: 'icons/nuclear.svg', color: '#00bfff', bcolor: '#D33673' }, + '4200': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' }, + '4201': { icon: 'icons/waste.svg', color: '#00bfff', bcolor: '#D33673' }, + '4202': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' }, + '4203': { icon: 'icons/island.svg', color: '#00bfff', bcolor: '#D33673' }, + '4204': { icon: 'icons/toilet.svg', color: '#00bfff', bcolor: '#D33673' }, + '5000': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, + '5100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, + '6000': { icon: 'icons/manufactorung-construction.svg', color: '#00bfff', bcolor: '#D33673' }, + '6100': { icon: 'icons/forest.svg', color: '#00bfff', bcolor: '#D33673' }, + '6101': { icon: 'icons/environment.svg', color: '#00bfff', bcolor: '#D33673' }, + '6102': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' }, + '6103': { icon: 'icons/pablicaffairs.svg', color: '#00bfff', bcolor: '#D33673' }, + '6104': { icon: 'icons/pig.svg', color: '#00bfff', bcolor: '#D33673' }, + '6200': { icon: 'icons/social-systems.svg', color: '#00bfff', bcolor: '#D33673' }, + '6300': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' }, + '6400': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, + '6500': { icon: 'icons/economy-tourism.svg', color: '#00bfff', bcolor: '#D33673' }, + '6501': { icon: 'icons/misc-services.svg', color: '#00bfff', bcolor: '#D33673' }, + '6502': { icon: 'icons/transport.svg', color: '#00bfff', bcolor: '#D33673' }, + '7000': { icon: 'icons/our-streets.svg', color: '#00bfff', bcolor: '#D33673' }, + '7100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, + '7101': { icon: 'icons/electricity.svg', color: '#00bfff', bcolor: '#D33673' }, + '7102': { icon: 'icons/reilways.svg', color: '#00bfff', bcolor: '#D33673' }, + '7103': { icon: 'icons/street-lights.svg', color: '#00bfff', bcolor: '#D33673' }, + '7104': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' }, + '7200': { icon: 'icons/traffic-watersup.svg', color: '#00bfff', bcolor: '#D33673' }, + '7201': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, + '7202': { icon: 'icons/harbor.svg', color: '#00bfff', bcolor: '#D33673' }, + '7203': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, + '7204': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, + '8000': { icon: 'icons/fire-brigade.svg', color: '#00bfff', bcolor: '#D33673' }, + '8100': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' }, + '8200': { icon: 'icons/order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, + '9000': { icon: 'icons/schools.svg', color: '#00bfff', bcolor: '#D33673' }, + '9100': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' }, + '9101': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' }, + '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 3e42417f160becb05eefc3269e4f50c00ea398c0 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 16 Apr 2015 14:52:44 +0900 Subject: [PATCH 144/229] dailybread.js --- js/dailybread.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/dailybread.js b/js/dailybread.js index 2042ea2e..7c16a0e9 100644 --- a/js/dailybread.js +++ b/js/dailybread.js @@ -132,6 +132,10 @@ OpenSpending.DailyBread = function (elem) { var tdAry = self.taxAndDataForTier(tierId) if (!tdAry) { return } // No child tier for selected area. var tax = tdAry[0], data = tdAry[1] + + if (tdAry == null ||tdAry[1][0][1] == 0){ return } + if (!tdAry) { return } // No child tier for selected area. + var tax = tdAry[0], data = tdAry[1] var t = self.tiers[tierId] = self.tiers[tierId] || $("
                        ").appendTo(self.$e) var n = data.length From 110f472939205c5525c19100f1fe65cd3ad26109 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 16 Apr 2015 17:33:19 +0900 Subject: [PATCH 145/229] kakogawa.svg --- icons/kakogawa.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 icons/kakogawa.svg diff --git a/icons/kakogawa.svg b/icons/kakogawa.svg new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/icons/kakogawa.svg @@ -0,0 +1 @@ + From f6f12043e69cd187f36e6ed70fe80d2e73a28cea Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 16 Apr 2015 17:38:05 +0900 Subject: [PATCH 146/229] kakogawa.svg --- icons/kakogawa.svg | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/icons/kakogawa.svg b/icons/kakogawa.svg index 8b137891..6bedcaf1 100644 --- a/icons/kakogawa.svg +++ b/icons/kakogawa.svg @@ -1 +1,63 @@ + + + + + + + + + image/svg+xml + + + + + + + + + From e575177348223f5a7c91bbff5a141966f1325951 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 16 Apr 2015 17:40:08 +0900 Subject: [PATCH 147/229] kakogawa.svg --- icons/kakogawa.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/icons/kakogawa.svg b/icons/kakogawa.svg index 6bedcaf1..711a1687 100644 --- a/icons/kakogawa.svg +++ b/icons/kakogawa.svg @@ -26,13 +26,13 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" - inkscape:cx="375" - inkscape:cy="520" + inkscape:cx="100" + inkscape:cy="100" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1366" - inkscape:window-height="715" + inkscape:window-width="100" + inkscape:window-height="100" inkscape:window-x="-8" inkscape:window-y="22" inkscape:window-maximized="1" /> From 189a6af7ba8d7ea7417be56b75bbd330b3638cfa Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 16 Apr 2015 17:43:42 +0900 Subject: [PATCH 148/229] kakogawa.svg --- icons/kakogawa.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/icons/kakogawa.svg b/icons/kakogawa.svg index 711a1687..8cf69263 100644 --- a/icons/kakogawa.svg +++ b/icons/kakogawa.svg @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="210mm" - height="297mm" + width="100px" + height="100px" viewBox="0 0 744.09448819 1052.3622047" id="svg2" version="1.1" @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" - inkscape:cx="100" - inkscape:cy="100" + inkscape:cx="50" + inkscape:cy="50" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" From 0986d4bb93984f0f0f50908176b80f44e23d8ad1 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 3 Jun 2015 17:15:59 +0900 Subject: [PATCH 149/229] kakogawa.svg --- icons/kakogawa.svg | 65 ++-------------------------------------------- 1 file changed, 2 insertions(+), 63 deletions(-) diff --git a/icons/kakogawa.svg b/icons/kakogawa.svg index 8cf69263..113b5ee0 100644 --- a/icons/kakogawa.svg +++ b/icons/kakogawa.svg @@ -1,63 +1,2 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - + + From 96fe5eb929f52df808d24bd26ddd7d5d184840ab Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 3 Jun 2015 17:18:54 +0900 Subject: [PATCH 150/229] setting.js z --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 049af969..e79acd2d 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,7 +18,7 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '1000': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, + '1000': { icon: 'icons/kakogawa.svg', color: '#00bfff', bcolor: '#00bfff' }, '1100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '2000': { icon: 'icons/family2.svg', color: '#00bfff', bcolor: '#c757ff' }, '2100': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, From d90d1ce7cf1f14159d30a057b90854535d88c5fa Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 3 Jun 2015 17:21:32 +0900 Subject: [PATCH 151/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index e79acd2d..049af969 100644 --- a/js/setting.js +++ b/js/setting.js @@ -18,7 +18,7 @@ OpenSpending.Styles = OpenSpending.Styles || {}; OpenSpending.Styles.Cofog = { /* yokohama cofog */ - '1000': { icon: 'icons/kakogawa.svg', color: '#00bfff', bcolor: '#00bfff' }, + '1000': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '1100': { icon: 'icons/planning.svg', color: '#00bfff', bcolor: '#00bfff' }, '2000': { icon: 'icons/family2.svg', color: '#00bfff', bcolor: '#c757ff' }, '2100': { icon: 'icons/publicaffairs.svg', color: '#00bfff', bcolor: '#0AB971' }, From 7081e9a10f836964a20fb8ddc078e034c2540ab6 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Jun 2015 10:50:54 +0900 Subject: [PATCH 152/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 049af969..993cbb40 100644 --- a/js/setting.js +++ b/js/setting.js @@ -27,7 +27,7 @@ OpenSpending.Styles.Cofog = { '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, - '3000': { icon: 'icons/unenployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '3000': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3100': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#EC2406' }, '3101': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#EC2406' }, '3102': { icon: 'icons/secondary-lower.svg', color: '#00bfff', bcolor: '#938626' }, From b196a9cdde180a350f17e953dc6ddbde13ccd40a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 5 Jun 2015 10:59:47 +0900 Subject: [PATCH 153/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 993cbb40..5f9b1ff7 100644 --- a/js/setting.js +++ b/js/setting.js @@ -56,7 +56,7 @@ OpenSpending.Styles.Cofog = { '4204': { icon: 'icons/toilet.svg', color: '#00bfff', bcolor: '#D33673' }, '5000': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, '5100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, - '6000': { icon: 'icons/manufactorung-construction.svg', color: '#00bfff', bcolor: '#D33673' }, + '6000': { icon: 'icons/manufactoring-construction.svg', color: '#00bfff', bcolor: '#D33673' }, '6100': { icon: 'icons/forest.svg', color: '#00bfff', bcolor: '#D33673' }, '6101': { icon: 'icons/environment.svg', color: '#00bfff', bcolor: '#D33673' }, '6102': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' }, From 926459045200e79c01975631c2cc4cc5f85f422b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 13:59:14 +0900 Subject: [PATCH 154/229] rever.svg --- icons/rever.svg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 icons/rever.svg diff --git a/icons/rever.svg b/icons/rever.svg new file mode 100644 index 00000000..3796ef60 --- /dev/null +++ b/icons/rever.svg @@ -0,0 +1,5 @@ + + + + + From 487f2e4a91abeb14f0c8cea6c7b91838efba2f45 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 14:00:59 +0900 Subject: [PATCH 155/229] setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 5f9b1ff7..d7ab6477 100644 --- a/js/setting.js +++ b/js/setting.js @@ -75,7 +75,7 @@ OpenSpending.Styles.Cofog = { '7103': { icon: 'icons/street-lights.svg', color: '#00bfff', bcolor: '#D33673' }, '7104': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' }, '7200': { icon: 'icons/traffic-watersup.svg', color: '#00bfff', bcolor: '#D33673' }, - '7201': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, + '7201': { icon: 'icons/rever.svg', color: '#00bfff', bcolor: '#D33673' }, '7202': { icon: 'icons/harbor.svg', color: '#00bfff', bcolor: '#D33673' }, '7203': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, '7204': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, From 6bae63913cb8b4e6a9af5ffe7cb76a157bbf4cab Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 14:48:17 +0900 Subject: [PATCH 156/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index d7ab6477..9aac69c3 100644 --- a/js/setting.js +++ b/js/setting.js @@ -27,6 +27,7 @@ OpenSpending.Styles.Cofog = { '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '2303': { icon: 'icons/car.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3100': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#EC2406' }, '3101': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#EC2406' }, From f460cbb8ec0111fabe089b60308a62e3c7703d6e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 14:53:16 +0900 Subject: [PATCH 157/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 9aac69c3..d1d7af7b 100644 --- a/js/setting.js +++ b/js/setting.js @@ -27,6 +27,7 @@ OpenSpending.Styles.Cofog = { '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '2301': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2303': { icon: 'icons/car.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3100': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#EC2406' }, From 5581e678b62ef4b246269857241c3b246ff959af Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 14:54:08 +0900 Subject: [PATCH 158/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index d1d7af7b..21ba2e85 100644 --- a/js/setting.js +++ b/js/setting.js @@ -27,7 +27,7 @@ OpenSpending.Styles.Cofog = { '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, - '2301': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '2302': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2303': { icon: 'icons/car.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3100': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#EC2406' }, From ff764bd91dc5e736a09575ba7e80e49567cd0661 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 15:17:40 +0900 Subject: [PATCH 159/229] Update rever.svg --- icons/rever.svg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/icons/rever.svg b/icons/rever.svg index 3796ef60..d9a23a9c 100644 --- a/icons/rever.svg +++ b/icons/rever.svg @@ -2,4 +2,5 @@ - + + From 24e9439bdeb1a91c583a96430196ff23c2821604 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 16:07:18 +0900 Subject: [PATCH 160/229] Create youtien.svg --- icons/youtien.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/youtien.svg diff --git a/icons/youtien.svg b/icons/youtien.svg new file mode 100644 index 00000000..004a22ce --- /dev/null +++ b/icons/youtien.svg @@ -0,0 +1,6 @@ + + + + + + From 05abdc1563de0ac87d855444087aaf6a26f8f2b6 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 16:08:06 +0900 Subject: [PATCH 161/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 21ba2e85..214ef04a 100644 --- a/js/setting.js +++ b/js/setting.js @@ -85,7 +85,7 @@ OpenSpending.Styles.Cofog = { '8100': { icon: 'icons/legislative.svg', color: '#00bfff', bcolor: '#D33673' }, '8200': { icon: 'icons/order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, '9000': { icon: 'icons/schools.svg', color: '#00bfff', bcolor: '#D33673' }, - '9100': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' }, + '9100': { icon: 'icons/youtien.svg', color: '#00bfff', bcolor: '#D33673' }, '9101': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' }, '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 006a07580f471eef536c4e4f8fcfdb1d3d8c42cf Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 16:50:54 +0900 Subject: [PATCH 162/229] Create bridge.svg --- icons/bridge.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/bridge.svg diff --git a/icons/bridge.svg b/icons/bridge.svg new file mode 100644 index 00000000..e7a0454c --- /dev/null +++ b/icons/bridge.svg @@ -0,0 +1,6 @@ + + + + + + From 32b7d659676b501f9a8b1b0a7cb3558554dbb372 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Wed, 10 Jun 2015 16:51:49 +0900 Subject: [PATCH 163/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 214ef04a..3201386d 100644 --- a/js/setting.js +++ b/js/setting.js @@ -73,7 +73,7 @@ OpenSpending.Styles.Cofog = { '7000': { icon: 'icons/our-streets.svg', color: '#00bfff', bcolor: '#D33673' }, '7100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, '7101': { icon: 'icons/electricity.svg', color: '#00bfff', bcolor: '#D33673' }, - '7102': { icon: 'icons/reilways.svg', color: '#00bfff', bcolor: '#D33673' }, + '7102': { icon: 'icons/bridge.svg', color: '#00bfff', bcolor: '#D33673' }, '7103': { icon: 'icons/street-lights.svg', color: '#00bfff', bcolor: '#D33673' }, '7104': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' }, '7200': { icon: 'icons/traffic-watersup.svg', color: '#00bfff', bcolor: '#D33673' }, From b1a1718463954f717d6d834470c93323fb8b0cd1 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 19 Jun 2015 11:01:30 +0900 Subject: [PATCH 164/229] Create bus.svg --- icons/bus.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/bus.svg diff --git a/icons/bus.svg b/icons/bus.svg new file mode 100644 index 00000000..7402aa74 --- /dev/null +++ b/icons/bus.svg @@ -0,0 +1,6 @@ + + + + + + From 2dddb05ce69046334b80552a398fff48a9f5133e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 23 Jun 2015 15:12:49 +0900 Subject: [PATCH 165/229] Create bosi.svg --- icons/bosi.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/bosi.svg diff --git a/icons/bosi.svg b/icons/bosi.svg new file mode 100644 index 00000000..8429707a --- /dev/null +++ b/icons/bosi.svg @@ -0,0 +1,6 @@ + + + + + + From af3cb5a3ffea4002a3a298a806c3a62dc3bc9ce6 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 23 Jun 2015 15:13:35 +0900 Subject: [PATCH 166/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 3201386d..2db0f677 100644 --- a/js/setting.js +++ b/js/setting.js @@ -34,7 +34,7 @@ OpenSpending.Styles.Cofog = { '3101': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#EC2406' }, '3102': { icon: 'icons/secondary-lower.svg', color: '#00bfff', bcolor: '#938626' }, '3103': { icon: 'icons/preschool.svg', color: '#00bfff', bcolor: '#938626' }, - '3104': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#C75746' }, + '3104': { icon: 'icons/bosi.svg', color: '#00bfff', bcolor: '#C75746' }, '3105': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#C75746' }, '3106': { icon: 'icons/helping-others.svg', color: '#C#00bfff', bcolor: '#D33673' }, '3107': { icon: 'icons/foreign-military-aid.svg', color: '#00bfff', bcolor: '#D33673' }, From 2efb886929579e4804c8efc21d52484fb6ea2dd1 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 27 Jun 2015 23:43:38 +0900 Subject: [PATCH 167/229] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index b41e9a26..49be1f6a 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,7 @@ drilldowns: ['Category', 'Subcategory', 'Subcategory02'], cuts: ['year:' + OpenSpending.year], rootNodeLabel: 'Total', - breakdown: 'Subcategory02', + breakdown: 'Subcategory', callback: function(data) { $('#content-wrap').show(); From 86023067a16e397164197135797f3db749caf5be Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 27 Jun 2015 23:44:58 +0900 Subject: [PATCH 168/229] Update index.html --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 49be1f6a..e191c810 100644 --- a/index.html +++ b/index.html @@ -31,10 +31,10 @@ apiUrl: 'http://openspending.org/api', //localApiCache: 'aggregate.json', dataset: OpenSpending.identifier, - drilldowns: ['Category', 'Subcategory', 'Subcategory02'], + drilldowns: ['Category', 'Subcategory'], cuts: ['year:' + OpenSpending.year], rootNodeLabel: 'Total', - breakdown: 'Subcategory', + breakdown: 'Subcategory02', callback: function(data) { $('#content-wrap').show(); From cf94e7d18d2b240b306d0c7b9cc7f0c464f4e4b7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 27 Jun 2015 23:46:36 +0900 Subject: [PATCH 169/229] Update index.html --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index e191c810..84fe962d 100644 --- a/index.html +++ b/index.html @@ -31,10 +31,10 @@ apiUrl: 'http://openspending.org/api', //localApiCache: 'aggregate.json', dataset: OpenSpending.identifier, - drilldowns: ['Category', 'Subcategory'], + drilldowns: ['Category', 'Subcategory','Subcategory02'], cuts: ['year:' + OpenSpending.year], rootNodeLabel: 'Total', - breakdown: 'Subcategory02', + breakdown: 'Subcategory', callback: function(data) { $('#content-wrap').show(); From 78b9972f3ebc466d51ca9d94b173f2512525d6c5 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 27 Jun 2015 23:47:28 +0900 Subject: [PATCH 170/229] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 84fe962d..dfbd4816 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,7 @@ drilldowns: ['Category', 'Subcategory','Subcategory02'], cuts: ['year:' + OpenSpending.year], rootNodeLabel: 'Total', - breakdown: 'Subcategory', + breakdown: 'Category', callback: function(data) { $('#content-wrap').show(); From 4edd72e901b71ab93266102c91b4b682ec62c637 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Jul 2015 11:21:33 +0900 Subject: [PATCH 171/229] Create bouy.svg --- icons/bouy.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/bouy.svg diff --git a/icons/bouy.svg b/icons/bouy.svg new file mode 100644 index 00000000..9183604c --- /dev/null +++ b/icons/bouy.svg @@ -0,0 +1,6 @@ + + + + + + From 980ec37b72e356a160d71f474b6c105c1758a22e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Jul 2015 11:28:08 +0900 Subject: [PATCH 172/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 2db0f677..091b1b39 100644 --- a/js/setting.js +++ b/js/setting.js @@ -33,7 +33,7 @@ OpenSpending.Styles.Cofog = { '3100': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#EC2406' }, '3101': { icon: 'icons/euro.svg', color: '#00bfff', bcolor: '#EC2406' }, '3102': { icon: 'icons/secondary-lower.svg', color: '#00bfff', bcolor: '#938626' }, - '3103': { icon: 'icons/preschool.svg', color: '#00bfff', bcolor: '#938626' }, + '3103': { icon: 'icons/bouy.svg', color: '#00bfff', bcolor: '#938626' }, '3104': { icon: 'icons/bosi.svg', color: '#00bfff', bcolor: '#C75746' }, '3105': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#C75746' }, '3106': { icon: 'icons/helping-others.svg', color: '#C#00bfff', bcolor: '#D33673' }, From 868bc405e709f9f9662a7a606be5bdae3100ee21 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Fri, 3 Jul 2015 11:44:05 +0900 Subject: [PATCH 173/229] Create cc.svg --- icons/cc.svg | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 icons/cc.svg diff --git a/icons/cc.svg b/icons/cc.svg new file mode 100644 index 00000000..62b3addf --- /dev/null +++ b/icons/cc.svg @@ -0,0 +1,9 @@ + + + + + + + From 95aea37069dc3dac264d743b6b368656d376a897 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 12:58:58 +0900 Subject: [PATCH 174/229] Create wel --- icons/wel | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 icons/wel diff --git a/icons/wel b/icons/wel new file mode 100644 index 00000000..fc80fcab --- /dev/null +++ b/icons/wel @@ -0,0 +1,9 @@ + + + + + + + From a34e162eb85430d9194086a1a57798f99e1986c5 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 13:02:19 +0900 Subject: [PATCH 175/229] Update wel --- icons/wel | 1 + 1 file changed, 1 insertion(+) diff --git a/icons/wel b/icons/wel index fc80fcab..3633f3cd 100644 --- a/icons/wel +++ b/icons/wel @@ -7,3 +7,4 @@ + From 503b7b957dc2ec584c98d8e1ce87eff7db2f711e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 13:06:25 +0900 Subject: [PATCH 176/229] Update wel --- icons/wel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/wel b/icons/wel index 3633f3cd..3e172e2b 100644 --- a/icons/wel +++ b/icons/wel @@ -1,3 +1,4 @@ + @@ -7,4 +8,3 @@ - From 0694a3c313b549fd1db1f7d2db6118a6ca271521 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 13:09:17 +0900 Subject: [PATCH 177/229] Update wel --- icons/wel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icons/wel b/icons/wel index 3e172e2b..d746d413 100644 --- a/icons/wel +++ b/icons/wel @@ -1,10 +1,10 @@ - - + +" transform="matrix(1 0 0 1 0 -3.4125)"> + From 9561392b8e33f38bba59bf2b19de6d0efeefbd8b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 13:10:12 +0900 Subject: [PATCH 178/229] Update wel --- icons/wel | 1 - 1 file changed, 1 deletion(-) diff --git a/icons/wel b/icons/wel index d746d413..62b3addf 100644 --- a/icons/wel +++ b/icons/wel @@ -1,4 +1,3 @@ - From ba4b70a6fbff3b31e1aaf46d8e622f3dab4bdbf4 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 13:11:25 +0900 Subject: [PATCH 179/229] Update wel --- icons/wel | 1 + 1 file changed, 1 insertion(+) diff --git a/icons/wel b/icons/wel index 62b3addf..c2dc70cb 100644 --- a/icons/wel +++ b/icons/wel @@ -7,3 +7,4 @@ " transform="matrix(1 0 0 1 0 -3.4125)"> + From ec2838e3d35fc621c6502cb82c128a19851d70cf Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 13:11:30 +0900 Subject: [PATCH 180/229] Create werupi.svg --- icons/werupi.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/werupi.svg diff --git a/icons/werupi.svg b/icons/werupi.svg new file mode 100644 index 00000000..6457d574 --- /dev/null +++ b/icons/werupi.svg @@ -0,0 +1,6 @@ + + + + + + From e277f9d8394250846016be94a62fc27a59edafe3 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 13:14:02 +0900 Subject: [PATCH 181/229] Create aaa --- icons/aaa | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 icons/aaa diff --git a/icons/aaa b/icons/aaa new file mode 100644 index 00000000..52c413f9 --- /dev/null +++ b/icons/aaa @@ -0,0 +1,7 @@ + + + + + + From 1c26e242d52979b26c062517a01bf64b212f77c3 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 13:14:23 +0900 Subject: [PATCH 182/229] Delete aaa --- icons/aaa | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 icons/aaa diff --git a/icons/aaa b/icons/aaa deleted file mode 100644 index 52c413f9..00000000 --- a/icons/aaa +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - From ee11556d55d7258b2154b51c7f15783cd379d33e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Thu, 9 Jul 2015 14:49:32 +0900 Subject: [PATCH 183/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 091b1b39..2c93a44b 100644 --- a/js/setting.js +++ b/js/setting.js @@ -26,6 +26,7 @@ OpenSpending.Styles.Cofog = { '2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, + '2202':{ icon: 'icons/werupi.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2302': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2303': { icon: 'icons/car.svg', color: '#00bfff', bcolor: '#2A3A03' }, From 359bfdb8212c570e381fa62d9053a74467b8cea6 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:12:13 +0900 Subject: [PATCH 184/229] Create school1 --- school1 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 school1 diff --git a/school1 b/school1 new file mode 100644 index 00000000..f09389bc --- /dev/null +++ b/school1 @@ -0,0 +1,6 @@ + + + + + + From ee369f8404f1a6555aa00b1ff136f70bf4a8e29c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:13:04 +0900 Subject: [PATCH 185/229] Rename school1 to school1.svg --- school1 => school1.svg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename school1 => school1.svg (100%) diff --git a/school1 b/school1.svg similarity index 100% rename from school1 rename to school1.svg From eab3d843a329d204305787f0153a98217fc76b9b Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:15:19 +0900 Subject: [PATCH 186/229] Create school1.svg --- icons/school1.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/school1.svg diff --git a/icons/school1.svg b/icons/school1.svg new file mode 100644 index 00000000..f09389bc --- /dev/null +++ b/icons/school1.svg @@ -0,0 +1,6 @@ + + + + + + From c34ed90339ba5d2965048e4945819ef57a359679 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:17:30 +0900 Subject: [PATCH 187/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 2c93a44b..aee4ebd0 100644 --- a/js/setting.js +++ b/js/setting.js @@ -89,4 +89,5 @@ OpenSpending.Styles.Cofog = { '9100': { icon: 'icons/youtien.svg', color: '#00bfff', bcolor: '#D33673' }, '9101': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' }, '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' }, + '9201': { icon: 'icons/school1.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 1ffb3a72e7c348f221a69b1637b86f0845488087 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:20:59 +0900 Subject: [PATCH 188/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index aee4ebd0..57effa79 100644 --- a/js/setting.js +++ b/js/setting.js @@ -89,5 +89,6 @@ OpenSpending.Styles.Cofog = { '9100': { icon: 'icons/youtien.svg', color: '#00bfff', bcolor: '#D33673' }, '9101': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' }, '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' }, + '9201': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' }, '9201': { icon: 'icons/school1.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 033f5ca6a5ebfc1b627d7c802b5f0e36ec6f8cbf Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:24:10 +0900 Subject: [PATCH 189/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 57effa79..4feeccae 100644 --- a/js/setting.js +++ b/js/setting.js @@ -89,6 +89,6 @@ OpenSpending.Styles.Cofog = { '9100': { icon: 'icons/youtien.svg', color: '#00bfff', bcolor: '#D33673' }, '9101': { icon: 'icons/housing.svg', color: '#00bfff', bcolor: '#D33673' }, '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' }, - '9201': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' }, + '9200': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' }, '9201': { icon: 'icons/school1.svg', color: '#00bfff', bcolor: '#D33673' }, }; From abdc1e3e40ba0038f2bfb8505a932cd3912b0bb7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:25:13 +0900 Subject: [PATCH 190/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 4feeccae..d8de7494 100644 --- a/js/setting.js +++ b/js/setting.js @@ -91,4 +91,5 @@ OpenSpending.Styles.Cofog = { '9102': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#D33673' }, '9200': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' }, '9201': { icon: 'icons/school1.svg', color: '#00bfff', bcolor: '#D33673' }, + '9300': { icon: 'icons/primary.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 5a66aea8a93f9d9d9fc9e25274db06141328f296 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:39:43 +0900 Subject: [PATCH 191/229] Create shefu.svg --- icons/shefu.svg | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 icons/shefu.svg diff --git a/icons/shefu.svg b/icons/shefu.svg new file mode 100644 index 00000000..2984e4cd --- /dev/null +++ b/icons/shefu.svg @@ -0,0 +1,78 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + From bec1bdc9774eeab51f5d3ebe87009334acb56322 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:41:01 +0900 Subject: [PATCH 192/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index d8de7494..210d64c4 100644 --- a/js/setting.js +++ b/js/setting.js @@ -92,4 +92,5 @@ OpenSpending.Styles.Cofog = { '9200': { icon: 'icons/pre-school.svg', color: '#00bfff', bcolor: '#D33673' }, '9201': { icon: 'icons/school1.svg', color: '#00bfff', bcolor: '#D33673' }, '9300': { icon: 'icons/primary.svg', color: '#00bfff', bcolor: '#D33673' }, + '9602': { icon: 'icons/shefu.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 5bef1d5a0fa081c6784ff31f464e00fb20030a45 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 12:41:56 +0900 Subject: [PATCH 193/229] Update shefu.svg --- icons/shefu.svg | 84 ++++--------------------------------------------- 1 file changed, 6 insertions(+), 78 deletions(-) diff --git a/icons/shefu.svg b/icons/shefu.svg index 2984e4cd..69f58bb4 100644 --- a/icons/shefu.svg +++ b/icons/shefu.svg @@ -1,78 +1,6 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + From 7cc24e58a6e8ca653ac8522dcc0aacc9831ab57f Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 15:06:27 +0900 Subject: [PATCH 194/229] Rename wel to wel.svg --- icons/{wel => wel.svg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename icons/{wel => wel.svg} (100%) diff --git a/icons/wel b/icons/wel.svg similarity index 100% rename from icons/wel rename to icons/wel.svg From 21965a7772864144d71184681033f6b10abb48d1 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 15:06:57 +0900 Subject: [PATCH 195/229] Rename wel.svg to cs.svg --- icons/{wel.svg => cs.svg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename icons/{wel.svg => cs.svg} (100%) diff --git a/icons/wel.svg b/icons/cs.svg similarity index 100% rename from icons/wel.svg rename to icons/cs.svg From 2e0f5dd00e93f9bc313f0ae23165110ee50bcd7e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 15:09:56 +0900 Subject: [PATCH 196/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 210d64c4..16f45983 100644 --- a/js/setting.js +++ b/js/setting.js @@ -25,6 +25,7 @@ OpenSpending.Styles.Cofog = { '2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, '2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, + '2107': { icon: 'icons/cs.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2202':{ icon: 'icons/werupi.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, From 8cca815c25f1ba7230bbdbac77c6d4fdf34f2fc7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 16:46:17 +0900 Subject: [PATCH 197/229] Create kouhou.svg --- icons/kouhou.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/kouhou.svg diff --git a/icons/kouhou.svg b/icons/kouhou.svg new file mode 100644 index 00000000..690b5421 --- /dev/null +++ b/icons/kouhou.svg @@ -0,0 +1,6 @@ + + + + + + From afa7be245f9e8902ce4a0979482a681405d5422c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 16:47:29 +0900 Subject: [PATCH 198/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 16f45983..18cafaaf 100644 --- a/js/setting.js +++ b/js/setting.js @@ -28,6 +28,7 @@ OpenSpending.Styles.Cofog = { '2107': { icon: 'icons/cs.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2202':{ icon: 'icons/werupi.svg', color: '#00bfff', bcolor: '#D33673' }, + '2204':{ icon: 'icons/kouhou.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2302': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2303': { icon: 'icons/car.svg', color: '#00bfff', bcolor: '#2A3A03' }, From ec5d098716454f003d2c097a4cbfbe0809f27960 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:00:31 +0900 Subject: [PATCH 199/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 18cafaaf..ee7452dd 100644 --- a/js/setting.js +++ b/js/setting.js @@ -95,4 +95,5 @@ OpenSpending.Styles.Cofog = { '9201': { icon: 'icons/school1.svg', color: '#00bfff', bcolor: '#D33673' }, '9300': { icon: 'icons/primary.svg', color: '#00bfff', bcolor: '#D33673' }, '9602': { icon: 'icons/shefu.svg', color: '#00bfff', bcolor: '#D33673' }, + '9707': { icon: 'icons/prisons.svg', color: '#00bfff', bcolor: '#D33673' }, }; From eb6fbcbf10268fa669a281a3513d3b5b614e0fbf Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:03:55 +0900 Subject: [PATCH 200/229] Create syoukyaku.svg --- icons/syoukyaku.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/syoukyaku.svg diff --git a/icons/syoukyaku.svg b/icons/syoukyaku.svg new file mode 100644 index 00000000..3765a91f --- /dev/null +++ b/icons/syoukyaku.svg @@ -0,0 +1,6 @@ + + + + + + From 41baee16750fd89af260762f71fad413b12cd6cd Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:04:42 +0900 Subject: [PATCH 201/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index ee7452dd..d79d8f01 100644 --- a/js/setting.js +++ b/js/setting.js @@ -57,7 +57,7 @@ OpenSpending.Styles.Cofog = { '4200': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' }, '4201': { icon: 'icons/waste.svg', color: '#00bfff', bcolor: '#D33673' }, '4202': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' }, - '4203': { icon: 'icons/island.svg', color: '#00bfff', bcolor: '#D33673' }, + '4203': { icon: 'icons/syokukyaku.svg', color: '#00bfff', bcolor: '#D33673' }, '4204': { icon: 'icons/toilet.svg', color: '#00bfff', bcolor: '#D33673' }, '5000': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, '5100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, From 644e1eafde36fd1eac86352e900468da3dbf1df0 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:06:14 +0900 Subject: [PATCH 202/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index d79d8f01..24125abc 100644 --- a/js/setting.js +++ b/js/setting.js @@ -57,7 +57,7 @@ OpenSpending.Styles.Cofog = { '4200': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' }, '4201': { icon: 'icons/waste.svg', color: '#00bfff', bcolor: '#D33673' }, '4202': { icon: 'icons/garbage.svg', color: '#00bfff', bcolor: '#D33673' }, - '4203': { icon: 'icons/syokukyaku.svg', color: '#00bfff', bcolor: '#D33673' }, + '4203': { icon: 'icons/syoukyaku.svg', color: '#00bfff', bcolor: '#D33673' }, '4204': { icon: 'icons/toilet.svg', color: '#00bfff', bcolor: '#D33673' }, '5000': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, '5100': { icon: 'icons/rd-order-safety.svg', color: '#00bfff', bcolor: '#D33673' }, From 001e7989e4bc5abecceb181f1e6e1499fe151cbf Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:07:51 +0900 Subject: [PATCH 203/229] Create book.svg --- icons/book.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/book.svg diff --git a/icons/book.svg b/icons/book.svg new file mode 100644 index 00000000..84592ac4 --- /dev/null +++ b/icons/book.svg @@ -0,0 +1,6 @@ + + + + + + From ef27c814dc6625db03410d981439b524bb664bef Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:08:43 +0900 Subject: [PATCH 204/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 24125abc..427c54e8 100644 --- a/js/setting.js +++ b/js/setting.js @@ -96,4 +96,5 @@ OpenSpending.Styles.Cofog = { '9300': { icon: 'icons/primary.svg', color: '#00bfff', bcolor: '#D33673' }, '9602': { icon: 'icons/shefu.svg', color: '#00bfff', bcolor: '#D33673' }, '9707': { icon: 'icons/prisons.svg', color: '#00bfff', bcolor: '#D33673' }, + '9708': { icon: 'icons/books.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 5b9fa896c06bce215a92c54cb97bae7984a840f7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:10:42 +0900 Subject: [PATCH 205/229] Update syoukyaku.svg --- icons/syoukyaku.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/syoukyaku.svg b/icons/syoukyaku.svg index 3765a91f..74431a9b 100644 --- a/icons/syoukyaku.svg +++ b/icons/syoukyaku.svg @@ -1,5 +1,5 @@ - + From 534a9d0e28784b0655eb0538c797c8d8c408dc3a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:11:27 +0900 Subject: [PATCH 206/229] Update syoukyaku.svg --- icons/syoukyaku.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/syoukyaku.svg b/icons/syoukyaku.svg index 74431a9b..8d1bb850 100644 --- a/icons/syoukyaku.svg +++ b/icons/syoukyaku.svg @@ -1,5 +1,5 @@ - + From 9675dc2325200ac9663fff96c64a576561a490d4 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:15:19 +0900 Subject: [PATCH 207/229] Update syoukyaku.svg --- icons/syoukyaku.svg | 78 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/icons/syoukyaku.svg b/icons/syoukyaku.svg index 8d1bb850..5131d602 100644 --- a/icons/syoukyaku.svg +++ b/icons/syoukyaku.svg @@ -1,6 +1,72 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + From 601fc31b90c2b6da98f6afb16c601f9485d26d4e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:21:19 +0900 Subject: [PATCH 208/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 427c54e8..8c3580df 100644 --- a/js/setting.js +++ b/js/setting.js @@ -52,7 +52,7 @@ OpenSpending.Styles.Cofog = { '4102': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, '4103': { icon: 'icons/hospital-specialized.svg', color: '#00bfff', bcolor: '#D33673' }, '4104': { icon: 'icons/health.svg', color: '#00bfff', bcolor: '#D33673' }, - '4105': { icon: 'icons/unknown.svg', color: '#00bfff', bcolor: '#D33673' }, + '4105': { icon: 'icons/pollution.svg', color: '#00bfff', bcolor: '#D33673' }, '4106': { icon: 'icons/nuclear.svg', color: '#00bfff', bcolor: '#D33673' }, '4200': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' }, '4201': { icon: 'icons/waste.svg', color: '#00bfff', bcolor: '#D33673' }, From 94193e1178f9a75188e385cc48fc6c95220d7838 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:24:12 +0900 Subject: [PATCH 209/229] Update syoukyaku.svg --- icons/syoukyaku.svg | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/icons/syoukyaku.svg b/icons/syoukyaku.svg index 5131d602..fd94e0b1 100644 --- a/icons/syoukyaku.svg +++ b/icons/syoukyaku.svg @@ -36,16 +36,16 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="688" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1027" id="namedview9" showgrid="false" - inkscape:zoom="2.9776562" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" + inkscape:zoom="7.1554812" + inkscape:cx="45.465718" + inkscape:cy="57.581799" + inkscape:window-x="-8" + inkscape:window-y="22" + inkscape:window-maximized="1" inkscape:current-layer="svg2" /> @@ -65,8 +65,9 @@ cy="50" r="50" id="circle5" /> + From 90d758a1c4ef5b66b6755667b771ef2c6029ef41 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:32:52 +0900 Subject: [PATCH 210/229] Create money3.svg --- icons/money3.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/money3.svg diff --git a/icons/money3.svg b/icons/money3.svg new file mode 100644 index 00000000..ba0cba1d --- /dev/null +++ b/icons/money3.svg @@ -0,0 +1,6 @@ + + + + + + From 9e91c567653733a49232b2c3843ab3d591cf3d66 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:33:50 +0900 Subject: [PATCH 211/229] Update setting.js --- js/setting.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/setting.js b/js/setting.js index 8c3580df..80d64cb8 100644 --- a/js/setting.js +++ b/js/setting.js @@ -97,4 +97,6 @@ OpenSpending.Styles.Cofog = { '9602': { icon: 'icons/shefu.svg', color: '#00bfff', bcolor: '#D33673' }, '9707': { icon: 'icons/prisons.svg', color: '#00bfff', bcolor: '#D33673' }, '9708': { icon: 'icons/books.svg', color: '#00bfff', bcolor: '#D33673' }, + '11000': { icon: 'icons/money3.svg', color: '#00bfff', bcolor: '#D33673' }, + '11100': { icon: 'icons/money3.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 8e774b9b287900a5f1dd67b624b0df45d20f5f39 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:35:29 +0900 Subject: [PATCH 212/229] Create kansi.svg --- icons/kansi.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/kansi.svg diff --git a/icons/kansi.svg b/icons/kansi.svg new file mode 100644 index 00000000..7610fe72 --- /dev/null +++ b/icons/kansi.svg @@ -0,0 +1,6 @@ + + + + + + From 2a61f280eaf746eb8b340f23a0fc309254cf26a7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:36:57 +0900 Subject: [PATCH 213/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 80d64cb8..69877051 100644 --- a/js/setting.js +++ b/js/setting.js @@ -30,6 +30,7 @@ OpenSpending.Styles.Cofog = { '2202':{ icon: 'icons/werupi.svg', color: '#00bfff', bcolor: '#D33673' }, '2204':{ icon: 'icons/kouhou.svg', color: '#00bfff', bcolor: '#D33673' }, '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '2301': { icon: 'icons/kansi.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2302': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2303': { icon: 'icons/car.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, From 8b619b6cebda968b4e634607d8ca0e2562e2e93e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:47:37 +0900 Subject: [PATCH 214/229] Create haka.svg --- icons/haka.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/haka.svg diff --git a/icons/haka.svg b/icons/haka.svg new file mode 100644 index 00000000..fcc01f4c --- /dev/null +++ b/icons/haka.svg @@ -0,0 +1,6 @@ + + + + + + From 0a88a0bb25cc9b5dc1f3a41975ca17c8ce5b217e Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:47:57 +0900 Subject: [PATCH 215/229] Update setting.js --- js/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/setting.js b/js/setting.js index 69877051..679f753c 100644 --- a/js/setting.js +++ b/js/setting.js @@ -52,7 +52,7 @@ OpenSpending.Styles.Cofog = { '4101': { icon: 'icons/hospital.svg', color: '#00bfff', bcolor: '#D33673' }, '4102': { icon: 'icons/water.svg', color: '#00bfff', bcolor: '#D33673' }, '4103': { icon: 'icons/hospital-specialized.svg', color: '#00bfff', bcolor: '#D33673' }, - '4104': { icon: 'icons/health.svg', color: '#00bfff', bcolor: '#D33673' }, + '4104': { icon: 'icons/haka.svg', color: '#00bfff', bcolor: '#D33673' }, '4105': { icon: 'icons/pollution.svg', color: '#00bfff', bcolor: '#D33673' }, '4106': { icon: 'icons/nuclear.svg', color: '#00bfff', bcolor: '#D33673' }, '4200': { icon: 'icons/tree.svg', color: '#00bfff', bcolor: '#D33673' }, From af1c16a8be84e6f1d18da3b839d5c722234b5e83 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:55:18 +0900 Subject: [PATCH 216/229] Create toukei.svg --- icons/toukei.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/toukei.svg diff --git a/icons/toukei.svg b/icons/toukei.svg new file mode 100644 index 00000000..99a197f9 --- /dev/null +++ b/icons/toukei.svg @@ -0,0 +1,6 @@ + + + + + + From 3a76e8e4428d1c88aeec48abf35dfe01c7be2e87 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:55:53 +0900 Subject: [PATCH 217/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 679f753c..b471c380 100644 --- a/js/setting.js +++ b/js/setting.js @@ -25,6 +25,7 @@ OpenSpending.Styles.Cofog = { '2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, '2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, + '2106': { icon: 'icons/toukei.svg', color: '#00bfff', bcolor: '#D33673' }, '2107': { icon: 'icons/cs.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2202':{ icon: 'icons/werupi.svg', color: '#00bfff', bcolor: '#D33673' }, From c1a210363f7fb6b8a641a283c8a169245c6808cd Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 17:57:34 +0900 Subject: [PATCH 218/229] Update toukei.svg --- icons/toukei.svg | 84 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 78 insertions(+), 6 deletions(-) diff --git a/icons/toukei.svg b/icons/toukei.svg index 99a197f9..5bfda7dc 100644 --- a/icons/toukei.svg +++ b/icons/toukei.svg @@ -1,6 +1,78 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + From b185cf6001326fd6e7083e36c5d4d2e955e0476c Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 18:07:56 +0900 Subject: [PATCH 219/229] Create enzetu.svg --- icons/enzetu.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/enzetu.svg diff --git a/icons/enzetu.svg b/icons/enzetu.svg new file mode 100644 index 00000000..97621ec7 --- /dev/null +++ b/icons/enzetu.svg @@ -0,0 +1,6 @@ + + + + + + From f94a279c36b7dfcab04e4b74e4a316054bee3ee7 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 18:08:34 +0900 Subject: [PATCH 220/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index b471c380..2409dd13 100644 --- a/js/setting.js +++ b/js/setting.js @@ -25,6 +25,7 @@ OpenSpending.Styles.Cofog = { '2101': { icon: 'icons/research.svg', color:'#00bfff' , bcolor:'' }, '2102': { icon: 'icons/money.svg', color: '#00bfff', bcolor: '#4E6D00' }, '2103': { icon: 'icons/human-resources.svg', color: '#00bfff', bcolor: '#D33673' }, + '2105': { icon: 'icons/enzetu.svg', color: '#00bfff', bcolor: '#D33673' }, '2106': { icon: 'icons/toukei.svg', color: '#00bfff', bcolor: '#D33673' }, '2107': { icon: 'icons/cs.svg', color: '#00bfff', bcolor: '#D33673' }, '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, From 2f6bb53c42b106c293d95fc5c517eb1767d380c2 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 18:16:39 +0900 Subject: [PATCH 221/229] Create sisyou.svg --- icons/sisyou.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/sisyou.svg diff --git a/icons/sisyou.svg b/icons/sisyou.svg new file mode 100644 index 00000000..71e96198 --- /dev/null +++ b/icons/sisyou.svg @@ -0,0 +1,6 @@ + + + + + + From df79ef5d671b1b48c30747e3b64e287829d2e5ac Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 18:17:40 +0900 Subject: [PATCH 222/229] Update setting.js --- js/setting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/setting.js b/js/setting.js index 2409dd13..45f83b93 100644 --- a/js/setting.js +++ b/js/setting.js @@ -31,9 +31,9 @@ OpenSpending.Styles.Cofog = { '2200': { icon: 'icons/family.svg', color: '#00bfff', bcolor: '#D33673' }, '2202':{ icon: 'icons/werupi.svg', color: '#00bfff', bcolor: '#D33673' }, '2204':{ icon: 'icons/kouhou.svg', color: '#00bfff', bcolor: '#D33673' }, - '2300': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '2300': { icon: 'icons/sisyou.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2301': { icon: 'icons/kansi.svg', color: '#00bfff', bcolor: '#2A3A03' }, - '2302': { icon: 'icons/government.svg', color: '#00bfff', bcolor: '#2A3A03' }, + '2302': { icon: 'icons/sisyou.svg', color: '#00bfff', bcolor: '#2A3A03' }, '2303': { icon: 'icons/car.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3000': { icon: 'icons/unemployment.svg', color: '#00bfff', bcolor: '#2A3A03' }, '3100': { icon: 'icons/EC.svg', color: '#00bfff', bcolor: '#EC2406' }, From d6c1fe188c3bbc67214b34b1c476bf29d8a3af2a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 19:09:26 +0900 Subject: [PATCH 223/229] Create yen.svg --- icons/yen.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/yen.svg diff --git a/icons/yen.svg b/icons/yen.svg new file mode 100644 index 00000000..925a30b9 --- /dev/null +++ b/icons/yen.svg @@ -0,0 +1,6 @@ + + + + + + From a5c6467a56e766ad13d79df4ccedff7e51edbb06 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Sat, 11 Jul 2015 19:11:19 +0900 Subject: [PATCH 224/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 45f83b93..7968a75e 100644 --- a/js/setting.js +++ b/js/setting.js @@ -100,6 +100,7 @@ OpenSpending.Styles.Cofog = { '9602': { icon: 'icons/shefu.svg', color: '#00bfff', bcolor: '#D33673' }, '9707': { icon: 'icons/prisons.svg', color: '#00bfff', bcolor: '#D33673' }, '9708': { icon: 'icons/books.svg', color: '#00bfff', bcolor: '#D33673' }, + '10000': { icon: 'icons/yen.svg', color: '#00bfff', bcolor: '#D33673' }, '11000': { icon: 'icons/money3.svg', color: '#00bfff', bcolor: '#D33673' }, '11100': { icon: 'icons/money3.svg', color: '#00bfff', bcolor: '#D33673' }, }; From 7aa71133414b97b8932378d2dc9b38e7159542fc Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 14 Jul 2015 16:08:50 +0900 Subject: [PATCH 225/229] Create natural.svg --- icons/natural.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/natural.svg diff --git a/icons/natural.svg b/icons/natural.svg new file mode 100644 index 00000000..fb060ba8 --- /dev/null +++ b/icons/natural.svg @@ -0,0 +1,6 @@ + + + + + + From 7bc72bd806e06a0865fd3d9faa3234379d7b33d6 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 14 Jul 2015 16:10:41 +0900 Subject: [PATCH 226/229] Update setting.js --- js/setting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/setting.js b/js/setting.js index 7968a75e..0fd05272 100644 --- a/js/setting.js +++ b/js/setting.js @@ -98,6 +98,7 @@ OpenSpending.Styles.Cofog = { '9201': { icon: 'icons/school1.svg', color: '#00bfff', bcolor: '#D33673' }, '9300': { icon: 'icons/primary.svg', color: '#00bfff', bcolor: '#D33673' }, '9602': { icon: 'icons/shefu.svg', color: '#00bfff', bcolor: '#D33673' }, + '9706': { icon: 'icons/natural.svg', color: '#00bfff', bcolor: '#D33673' }, '9707': { icon: 'icons/prisons.svg', color: '#00bfff', bcolor: '#D33673' }, '9708': { icon: 'icons/books.svg', color: '#00bfff', bcolor: '#D33673' }, '10000': { icon: 'icons/yen.svg', color: '#00bfff', bcolor: '#D33673' }, From 45e93efecaa2751ef8e6dfd2f417f1c697bd06f6 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 14 Jul 2015 16:26:04 +0900 Subject: [PATCH 227/229] Create villding.svg --- icons/villding.svg | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/villding.svg diff --git a/icons/villding.svg b/icons/villding.svg new file mode 100644 index 00000000..4ba56845 --- /dev/null +++ b/icons/villding.svg @@ -0,0 +1,6 @@ + + + + + + From 5c56b58c793b0e3f52620b729c4fbe6096f5bd23 Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 14 Jul 2015 16:26:24 +0900 Subject: [PATCH 228/229] Create villding.png --- icons/villding.png | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 icons/villding.png diff --git a/icons/villding.png b/icons/villding.png new file mode 100644 index 00000000..4ba56845 --- /dev/null +++ b/icons/villding.png @@ -0,0 +1,6 @@ + + + + + + From 54f5699dd300dbe723fe0601fa6255aff2620d4a Mon Sep 17 00:00:00 2001 From: Jizai2012ikusei Date: Tue, 14 Jul 2015 16:37:39 +0900 Subject: [PATCH 229/229] Create log_kakogawa.png --- img/log_kakogawa.png | 1 + 1 file changed, 1 insertion(+) create mode 100644 img/log_kakogawa.png diff --git a/img/log_kakogawa.png b/img/log_kakogawa.png new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/img/log_kakogawa.png @@ -0,0 +1 @@ +