From d87fc01693b96e700cbb02a6f92285823265e8cb Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Wed, 24 Apr 2013 18:33:57 +0900
Subject: [PATCH 01/12] =?UTF-8?q?=E6=9C=80=E7=B5=82=E3=83=AA=E3=83=AA?=
=?UTF-8?q?=E3=83=BC=E3=82=B9=E3=81=8B=E3=82=892013/4/24=E3=81=BE=E3=81=A7?=
=?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=E5=88=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
banner/install.ini | 1 +
.../banner_view_edit_category_list.html | 82 ++++++++++---------
blogparts/view/maple.ini | 3 +
faq/action/main/delete/maple.ini | 15 ++--
faq/action/main/post/Post.class.php | 9 +-
faq/action/main/post/maple.ini | 23 ++----
faq/action/mobile/post/Post.class.php | 35 ++++++++
faq/action/mobile/post/maple.ini | 3 +
faq/install.ini | 5 +-
faq/language/chinese/main.ini | 30 +++----
faq/language/english/main.ini | 30 +++----
faq/language/japanese/main.ini | 30 +++----
.../default/faq_mobile_init_control.html | 34 ++++++++
.../default/faq_mobile_init_page.html | 35 ++++++++
faq/templates/default/faq_mobile_post.html | 23 ++++++
.../default/faq_mobile_post_feature.html | 30 +++++++
.../default/faq_mobile_post_smart.html | 26 ++++++
.../default/faq_mobile_view_detail.html | 31 +++++++
.../default/faq_mobile_view_main_init.html | 42 ++++++++++
.../default/faq_view_edit_category.html | 3 +-
faq/templates/default/faq_view_main_init.html | 17 ++--
.../default/faq_view_main_init_control.html | 6 +-
.../default/faq_view_main_init_page.html | 17 ++--
faq/templates/default/faq_view_main_post.html | 33 ++++----
faq/templates/default/faq_view_main_seq.html | 42 +++++-----
faq/templates/faq_script.html | 4 +-
.../Validator_QuestionView.class.php | 47 +++++++++++
faq/view/main/init/Init.class.php | 30 ++++---
faq/view/main/init/maple.ini | 14 +++-
faq/view/mobile/delete/Delete.class.php | 33 ++++++++
faq/view/mobile/delete/maple.ini | 12 +++
faq/view/mobile/detail/Detail.class.php | 32 ++++++++
faq/view/mobile/detail/maple.ini | 8 ++
multimedia/install.ini | 1 +
.../default/scheduler_view_main_list.html | 20 ++---
35 files changed, 606 insertions(+), 200 deletions(-)
create mode 100644 faq/action/mobile/post/Post.class.php
create mode 100644 faq/action/mobile/post/maple.ini
create mode 100644 faq/templates/default/faq_mobile_init_control.html
create mode 100644 faq/templates/default/faq_mobile_init_page.html
create mode 100644 faq/templates/default/faq_mobile_post.html
create mode 100644 faq/templates/default/faq_mobile_post_feature.html
create mode 100644 faq/templates/default/faq_mobile_post_smart.html
create mode 100644 faq/templates/default/faq_mobile_view_detail.html
create mode 100644 faq/templates/default/faq_mobile_view_main_init.html
create mode 100644 faq/validator/Validator_QuestionView.class.php
create mode 100644 faq/view/mobile/delete/Delete.class.php
create mode 100644 faq/view/mobile/delete/maple.ini
create mode 100644 faq/view/mobile/detail/Detail.class.php
create mode 100644 faq/view/mobile/detail/maple.ini
diff --git a/banner/install.ini b/banner/install.ini
index 36c118e..7577ecb 100644
--- a/banner/install.ini
+++ b/banner/install.ini
@@ -24,3 +24,4 @@ category_id =
block_id = core.block_id
room_id = core.page_id
upload_id = core.upload_id
+banner.image_path = text.upload_id
\ No newline at end of file
diff --git a/banner/templates/default/banner_view_edit_category_list.html b/banner/templates/default/banner_view_edit_category_list.html
index b4ff45b..514f467 100644
--- a/banner/templates/default/banner_view_edit_category_list.html
+++ b/banner/templates/default/banner_view_edit_category_list.html
@@ -41,46 +41,48 @@
<{include file = "../banner_script.html"}>
-
+
+ dropZone = null;
+ dragArea = null;
+ dragDrop = null;
+ rows = null;
+
+<{/if}>
<{/strip}>
\ No newline at end of file
diff --git a/blogparts/view/maple.ini b/blogparts/view/maple.ini
index 5257ef1..b251d74 100644
--- a/blogparts/view/maple.ini
+++ b/blogparts/view/maple.ini
@@ -1,6 +1,9 @@
[DIContainer]
filename = "/modules/blogparts/view/dicon.ini"
+[HeaderInc]
+blogparts_css = "blogparts:{$temp_name}/style.css"
+
[View]
; //テーマを使用するかどうかを指定
define:theme = 1
diff --git a/faq/action/main/delete/maple.ini b/faq/action/main/delete/maple.ini
index 0633a4d..69bf3a8 100644
--- a/faq/action/main/delete/maple.ini
+++ b/faq/action/main/delete/maple.ini
@@ -1,7 +1,3 @@
-[Mobile]
-p_id = post_id
-c_id = comment_id
-
[TokenExtra]
mode = "check"
action = "faq_view_main_post"
@@ -11,14 +7,13 @@ key:room_id,block_id,faq_id.faq.faqExists:g = "1:lang._invalid_input"
key:block_id,faq_id.faq.faqView:g = "1:lang._invalid_input"
key:question_id.faq.questionEditAuth:g = "1:lang._invalid_auth"
-[Action]
-request = "ref:Request"
-session = "ref:Session"
-;whatsnewAction = "ref:whatsnewAction"
-
[View]
main = "action:faq_view_main_init"
error = "main:error.html"
[MobileView]
-success = "location:{location_action}&block_id={block_id}&p_id={post_id}&comment_flag={comment_flag}{session_param}"
\ No newline at end of file
+main = "action:faq_view_main_init"
+
+[Action]
+request = "ref:Request"
+session = "ref:Session"
\ No newline at end of file
diff --git a/faq/action/main/post/Post.class.php b/faq/action/main/post/Post.class.php
index f58c24e..c7ebda0 100644
--- a/faq/action/main/post/Post.class.php
+++ b/faq/action/main/post/Post.class.php
@@ -3,7 +3,7 @@
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
- * [[機能説明]]
+ * 質問登録アクションクラス
*
* @package NetCommons
* @author Noriko Arai,Ryuji Masukawa
@@ -28,15 +28,11 @@ class Faq_Action_Main_Post extends Action
// 使用コンポーネントを受け取るため
var $faqView = null;
var $db = null;
- //var $whatsnewAction = null;
var $request = null;
var $session = null;
- var $configView = null;
-
- // 値をセットするため
/**
- * [[機能説明]]
+ * 質問登録アクション
*
* @access public
*/
@@ -84,6 +80,7 @@ function execute()
return "error";
}
+ $this->request->setParameter('question_id', $question_id);
$this->question_id = $question_id;
}
diff --git a/faq/action/main/post/maple.ini b/faq/action/main/post/maple.ini
index 470df8b..64ade4e 100644
--- a/faq/action/main/post/maple.ini
+++ b/faq/action/main/post/maple.ini
@@ -1,18 +1,12 @@
[SmartyAssign]
config = main.ini
-[Mobile]
-;j_id = journal_id
-;p_id = post_id
-;cat_id = category_id
-;input_date:month,day,year = journal_date
-
[TokenExtra]
mode = "check"
action = "faq_view_main_post"
[MobileConvert]
-content =
+content =
[Convert]
question_name.EscapeText =
@@ -22,23 +16,20 @@ question_answer.EscapeTextarea =
key:room_id,block_id,faq_id.faq.faqExists:g = "1:lang._invalid_input"
key:block_id,faq_id.faq.faqView:g = "1:lang._invalid_input"
key:question_id.faq.questionEditAuth:g = "1:lang._invalid_auth"
-question_name.required = "1:lang._required,lang.question_title"
-question_name.maxlength = "1,_VALIDATOR_TEXTAREA_LEN:lang._maxlength_error,lang.question_title,_VALIDATOR_TEXTAREA_LEN"
-question_answer.required = "1:lang._required,lang.question_answer"
-question_answer.maxlength = "1,_VALIDATOR_TEXTAREA_LEN:lang._maxlength_error,lang.question_answer,_VALIDATOR_TEXTAREA_LEN"
+question_name.required = "1:lang._required,lang.faq_question_title"
+question_name.maxlength = "1,_VALIDATOR_TEXTAREA_LEN:lang._maxlength_error,lang.faq_question_title,_VALIDATOR_TEXTAREA_LEN"
+question_answer.required = "1:lang._required,lang.faq_question_answer"
+question_answer.maxlength = "1,_VALIDATOR_TEXTAREA_LEN:lang._maxlength_error,lang.faq_question_answer,_VALIDATOR_TEXTAREA_LEN"
[Action]
faqView = "ref:faqView"
-;faqAction = "ref:faqAction"
-;whatsnewAction = "ref:whatsnewAction"
request = "ref:Request"
session = "ref:Session"
-configView = "ref:configView"
[View]
success = "action:faq_view_main_init"
error = "main:error.html"
[MobileView]
-;mail = "action:journal_action_main_mail"
-;success = "location:journal_view_main_detail&block_id={block_id}&p_id={post_id}{session_param}"
+success = "action:faq_view_mobile_detail"
+error = "main:mobile_error.html"
\ No newline at end of file
diff --git a/faq/action/mobile/post/Post.class.php b/faq/action/mobile/post/Post.class.php
new file mode 100644
index 0000000..d959143
--- /dev/null
+++ b/faq/action/mobile/post/Post.class.php
@@ -0,0 +1,35 @@
+regist)) {
+ return 'regist';
+ } else {
+ return 'cancel';
+ }
+ }
+}
+?>
\ No newline at end of file
diff --git a/faq/action/mobile/post/maple.ini b/faq/action/mobile/post/maple.ini
new file mode 100644
index 0000000..550c63e
--- /dev/null
+++ b/faq/action/mobile/post/maple.ini
@@ -0,0 +1,3 @@
+[MobileView]
+regist = "action:faq_action_main_post"
+cancel = "action:faq_view_main_init"
\ No newline at end of file
diff --git a/faq/install.ini b/faq/install.ini
index 8ea319d..400fc79 100644
--- a/faq/install.ini
+++ b/faq/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name = "faq_view_main_init"
edit_action_name = "faq_view_edit_list"
block_add_action = "faq_view_edit_create"
@@ -15,6 +15,9 @@ visible_item = "10"
faq_list_row_count = "10"
faq_authority = "_AUTH_CHIEF"
+[Mobile]
+mobile_action_name = "faq_view_main_init"
+
[Operation]
select_sql = "SELECT {faq}.faq_id,{faq}.faq_name FROM {faq_block},{faq} WHERE {faq_block}.faq_id = {faq}.faq_id AND {faq_block}.block_id = ?"
select_args = "block_id"
diff --git a/faq/language/chinese/main.ini b/faq/language/chinese/main.ini
index 8db93e8..30fb677 100644
--- a/faq/language/chinese/main.ini
+++ b/faq/language/chinese/main.ini
@@ -21,7 +21,7 @@ faq_catlist = "显示分类选择列表"
faq_show_catlist = "显示"
faq_no_show_catlist = "不显示"
faq_none_exist = "暂无可显示的常见问题."
-noneexists_category = "暂无常见问题"
+faq_noneexists_category = "暂无常见问题"
define:FAQ_NAME = "常见问题集"
define:FAQ_NOCATEGORY = "尚未指定"
faq_nocategory = FAQ_NOCATEGORY
@@ -31,17 +31,17 @@ faq_display_item_all = "全部显示"
faq_display_item = ""
faq_post_category = "类别"
-question_none_post = "暂无可显示的常见问题."
-question_nocategory = "尚未指定"
-question_change_seq = "改变显示顺序"
-question_change_seq_end = "结束修改"
-question_delete_confirm = "您确定要删除此问题吗?"
-question_new_title = "添加新问题"
-question_category_select = "选择分类"
-question_back = "上一页"
-question_next = "下一页"
-question_title = "问题"
-question_answer = "回答"
-question_edit = "编辑"
-question_del = "删除"
-question_hide = "隐藏"
+faq_question_none_post = "暂无可显示的常见问题."
+faq_question_nocategory = "尚未指定"
+faq_question_change_seq = "改变显示顺序"
+faq_question_change_seq_end = "结束修改"
+faq_question_delete_confirm = "您确定要删除此问题吗?"
+faq_question_new_title = "添加新问题"
+faq_question_category_select = "选择分类"
+faq_question_back = "上一页"
+faq_question_next = "下一页"
+faq_question_title = "问题"
+faq_question_answer = "回答"
+faq_question_edit = "编辑"
+faq_question_del = "删除"
+faq_question_hide = "隐藏"
diff --git a/faq/language/english/main.ini b/faq/language/english/main.ini
index 9da5a1d..43e1599 100644
--- a/faq/language/english/main.ini
+++ b/faq/language/english/main.ini
@@ -21,7 +21,7 @@ faq_catlist = "Category selector"
faq_show_catlist = "Visible"
faq_no_show_catlist = "Invisible"
faq_none_exist = "No FAQ to display"
-noneexists_category = "No FAQ found"
+faq_noneexists_category = "No FAQ found"
define:FAQ_NAME = "FAQ"
define:FAQ_NOCATEGORY = "Not specified"
faq_nocategory = FAQ_NOCATEGORY
@@ -31,17 +31,17 @@ faq_display_item_all = "All"
faq_display_item = ""
faq_post_category = "Category"
-question_none_post = "No question found."
-question_nocategory = "Not specified"
-question_change_seq = "Change order"
-question_change_seq_end = "Display order changed"
-question_delete_confirm = "Deleting this question.\n Are you sure?"
-question_new_title = "New question"
-question_category_select = "Category"
-question_back = "Prev"
-question_next = "Next"
-question_title = "Question"
-question_answer = "Answer"
-question_edit = "Edit"
-question_del = "Delete"
-question_hide = "Hide"
+faq_question_none_post = "No question found."
+faq_question_nocategory = "Not specified"
+faq_question_change_seq = "Change order"
+faq_question_change_seq_end = "Display order changed"
+faq_question_delete_confirm = "Deleting this question.\n Are you sure?"
+faq_question_new_title = "New question"
+faq_question_category_select = "Category"
+faq_question_back = "Prev"
+faq_question_next = "Next"
+faq_question_title = "Question"
+faq_question_answer = "Answer"
+faq_question_edit = "Edit"
+faq_question_del = "Delete"
+faq_question_hide = "Hide"
diff --git a/faq/language/japanese/main.ini b/faq/language/japanese/main.ini
index 96e061b..02ec784 100644
--- a/faq/language/japanese/main.ini
+++ b/faq/language/japanese/main.ini
@@ -21,7 +21,7 @@ faq_catlist = "カテゴリの表示"
faq_show_catlist = "表示する"
faq_no_show_catlist = "表示しない"
faq_none_exist = "現在作成されているFAQはありません。"
-noneexists_category = "一件も該当カテゴリはありません。"
+faq_noneexists_category = "一件も該当カテゴリはありません。"
define:FAQ_NAME = "FAQ"
define:FAQ_NOCATEGORY = "カテゴリを指定しない"
faq_nocategory = FAQ_NOCATEGORY
@@ -31,17 +31,17 @@ faq_display_item_all = "全て"
faq_display_item = "件"
faq_post_category = "カテゴリ"
-question_none_post = "一件も該当質問はありません。"
-question_nocategory = "カテゴリを指定しない"
-question_change_seq = "表示順変更"
-question_change_seq_end = "表示順変更終了"
-question_delete_confirm = "決定するとこの質問が削除されます。\nよろしいですか?"
-question_new_title = "項目を作成する"
-question_category_select = "カテゴリ選択"
-question_back = "前"
-question_next = "次"
-question_title = "質問"
-question_answer = "答え"
-question_edit = "編集"
-question_del = "削除"
-question_hide = "閉じる"
+faq_question_none_post = "一件も該当質問はありません。"
+faq_question_nocategory = "カテゴリを指定しない"
+faq_question_change_seq = "表示順変更"
+faq_question_change_seq_end = "表示順変更終了"
+faq_question_delete_confirm = "決定するとこの質問が削除されます。\nよろしいですか?"
+faq_question_new_title = "項目を作成する"
+faq_question_category_select = "カテゴリ選択"
+faq_question_back = "前"
+faq_question_next = "次"
+faq_question_title = "質問"
+faq_question_answer = "答え"
+faq_question_edit = "編集"
+faq_question_del = "削除"
+faq_question_hide = "閉じる"
diff --git a/faq/templates/default/faq_mobile_init_control.html b/faq/templates/default/faq_mobile_init_control.html
new file mode 100644
index 0000000..99556dd
--- /dev/null
+++ b/faq/templates/default/faq_mobile_init_control.html
@@ -0,0 +1,34 @@
+<{strip}>
+<{* カテゴリ、表示件数切り替え *}>
+
+<{/strip}>
diff --git a/faq/templates/default/faq_mobile_init_page.html b/faq/templates/default/faq_mobile_init_page.html
new file mode 100644
index 0000000..244b1fb
--- /dev/null
+++ b/faq/templates/default/faq_mobile_init_page.html
@@ -0,0 +1,35 @@
+<{strip}>
+<{* ページ切り替え *}>
+<{if $action.total_page > 1 }>
+
+
+
+<{/if}>
+
+<{/strip}>
diff --git a/faq/templates/default/faq_mobile_post.html b/faq/templates/default/faq_mobile_post.html
new file mode 100644
index 0000000..05f527b
--- /dev/null
+++ b/faq/templates/default/faq_mobile_post.html
@@ -0,0 +1,23 @@
+<{strip}>
+<{* FAQ投稿画面 *}>
+
+<{/strip}>
diff --git a/faq/templates/default/faq_mobile_post_feature.html b/faq/templates/default/faq_mobile_post_feature.html
new file mode 100644
index 0000000..0d2f8fb
--- /dev/null
+++ b/faq/templates/default/faq_mobile_post_feature.html
@@ -0,0 +1,30 @@
+<{strip}>
+<{* FAQ投稿画面携帯用 *}>
+<{if ($action.cate_can_select==false)}>
+
+<{else}>
+
+ <{$lang.faq_post_category|smarty:nodefaults}>
+
+
+
+
+<{/if}>
+
+
+ <{$lang.faq_question_title|smarty:nodefaults}>
+
+
+
+
+
+<{$lang.faq_question_answer|smarty:nodefaults}>
+
+
+
+<{/strip}>
diff --git a/faq/templates/default/faq_mobile_post_smart.html b/faq/templates/default/faq_mobile_post_smart.html
new file mode 100644
index 0000000..3045ec5
--- /dev/null
+++ b/faq/templates/default/faq_mobile_post_smart.html
@@ -0,0 +1,26 @@
+<{strip}>
+<{* FAQ投稿画面スマホ用 *}>
+<{if ($action.cate_can_select==false)}>
+
+<{else}>
+
+<{/if}>
+
+
+
+
+<{/strip}>
diff --git a/faq/templates/default/faq_mobile_view_detail.html b/faq/templates/default/faq_mobile_view_detail.html
new file mode 100644
index 0000000..f25584c
--- /dev/null
+++ b/faq/templates/default/faq_mobile_view_detail.html
@@ -0,0 +1,31 @@
+<{strip}>
+<{* FAQ携帯・スマホ詳細表示画面 *}>
+
+
"/>
+ <{$action.question.question_name|smarty:nodefaults}>
+
+
+
"/>
+ <{$action.question.question_answer|smarty:nodefaults|img_style_rgb_to_hex|wysiwig_convert_url}>
+
+
+<{if $action.question.has_edit_auth}>
+
+<{/if}>
+
+
+<{/strip}>
diff --git a/faq/templates/default/faq_mobile_view_main_init.html b/faq/templates/default/faq_mobile_view_main_init.html
new file mode 100644
index 0000000..bfc4823
--- /dev/null
+++ b/faq/templates/default/faq_mobile_view_main_init.html
@@ -0,0 +1,42 @@
+<{strip}>
+<{* FAQ携帯スマホ一覧表示画面 *}>
+<{* タイトル *}>
+<{$action.faq_obj.faq_name}>
+
+<{include file="faq_mobile_init_control.html"}>
+<{include file="faq_mobile_init_page.html"}>
+
+
+ <{if $action.question_count == 0}>
+ <{$lang.faq_noneexists_category|smarty:nodefaults}>
+ <{else}>
+
+ <{/if}>
+
+
+
+<{if $action.faq_obj.has_post_auth}>
+
+
" style="vertical-align:middle;" />
+ <{$lang.faq_question_new_title|smarty:nodefaults}>
+
+<{/if}>
+
+
+<{/strip}>
\ No newline at end of file
diff --git a/faq/templates/default/faq_view_edit_category.html b/faq/templates/default/faq_view_edit_category.html
index 0c1f1a2..a4aea14 100644
--- a/faq/templates/default/faq_view_edit_category.html
+++ b/faq/templates/default/faq_view_edit_category.html
@@ -1,4 +1,5 @@
<{strip}>
+<{* カテゴリー編集画面用テンプレート *}>
<{$action.faq_obj.faq_name}>
@@ -17,7 +18,7 @@
<{ include file="faq_view_edit_category_comp.html" }>
<{if $action.category_count == 0}>
- <{$lang.noneexists_category|smarty:nodefaults}>
+ <{$lang.faq_noneexists_category|smarty:nodefaults}>
<{else}>
<{foreach item=cat from=$action.categories}>
diff --git a/faq/templates/default/faq_view_main_init.html b/faq/templates/default/faq_view_main_init.html
index dcd2030..4c7643c 100644
--- a/faq/templates/default/faq_view_main_init.html
+++ b/faq/templates/default/faq_view_main_init.html
@@ -1,4 +1,5 @@
<{strip}>
+<{* 質問一覧画面用テンプレート *}>
diff --git a/faq/templates/default/faq_view_main_init_control.html b/faq/templates/default/faq_view_main_init_control.html
index fa933c7..3a9d090 100644
--- a/faq/templates/default/faq_view_main_init_control.html
+++ b/faq/templates/default/faq_view_main_init_control.html
@@ -1,14 +1,14 @@
<{strip}>
+<{* 質問一覧画面ヘッダー部用テンプレート *}>
-
-
+