From 3b907627f713024a711f02defe478f94a0291227 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Fri, 3 Jul 2015 18:35:10 +0900 Subject: [PATCH] fix links --- .../main/controllers/modals/AgreementModalController.js | 4 +++- src/browser/main/controllers/modals/PPModalController.js | 4 +++- src/browser/main/tpls/modals/pp.html | 2 +- src/browser/main/tpls/modals/regulation.html | 2 +- src/browser/main/tpls/states/home.tpl.html | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/browser/main/controllers/modals/AgreementModalController.js b/src/browser/main/controllers/modals/AgreementModalController.js index 233d51e7..e5a077a6 100644 --- a/src/browser/main/controllers/modals/AgreementModalController.js +++ b/src/browser/main/controllers/modals/AgreementModalController.js @@ -1,10 +1,12 @@ /* global angular */ angular.module('codexen') - .controller('AgreementModalController', function ($modalInstance) { + .controller('AgreementModalController', function ($modalInstance, Modal) { var vm = this vm.isAgreement = true + vm.showPP = Modal.showPP + vm.submit = function () { $modalInstance.close() } diff --git a/src/browser/main/controllers/modals/PPModalController.js b/src/browser/main/controllers/modals/PPModalController.js index 77a89b79..5b3bd9e6 100644 --- a/src/browser/main/controllers/modals/PPModalController.js +++ b/src/browser/main/controllers/modals/PPModalController.js @@ -1,10 +1,12 @@ /* global angular */ angular.module('codexen') - .controller('PPModalController', function ($modalInstance) { + .controller('PPModalController', function ($modalInstance, Modal) { var vm = this vm.isAgreement = false + vm.showPP = Modal.showPP + vm.cancel = function () { $modalInstance.dismiss('cancel') } diff --git a/src/browser/main/tpls/modals/pp.html b/src/browser/main/tpls/modals/pp.html index f4942dc8..52087b42 100644 --- a/src/browser/main/tpls/modals/pp.html +++ b/src/browser/main/tpls/modals/pp.html @@ -111,7 +111,7 @@ diff --git a/src/browser/main/tpls/modals/regulation.html b/src/browser/main/tpls/modals/regulation.html index 118ec305..193ccbc9 100644 --- a/src/browser/main/tpls/modals/regulation.html +++ b/src/browser/main/tpls/modals/regulation.html @@ -248,7 +248,7 @@

第16条(個人情報の保護)

-

 当社は、プライバシー・ポリシー(リンク)に従って、ユーザーの個人情報を適切に取り扱います。

+

 当社は、プライバシー・ポリシー(リンク)に従って、ユーザーの個人情報を適切に取り扱います。

以上

diff --git a/src/browser/main/tpls/states/home.tpl.html b/src/browser/main/tpls/states/home.tpl.html index 343dacf2..45a54b27 100644 --- a/src/browser/main/tpls/states/home.tpl.html +++ b/src/browser/main/tpls/states/home.tpl.html @@ -1,5 +1,5 @@
-

Codexen App v0.1.1

+

Codexen App v0.1.2

About CodeXen