diff --git a/Locale/jpn/LC_MESSAGES/net_commons.po b/Locale/jpn/LC_MESSAGES/net_commons.po
index af098eee..957075cd 100644
--- a/Locale/jpn/LC_MESSAGES/net_commons.po
+++ b/Locale/jpn/LC_MESSAGES/net_commons.po
@@ -290,7 +290,7 @@ msgstr ""
#
-#: ボタン
+#: 一覧表示のヘッダー
#
#: AccessCounters/View/Elements/AccessCounters/delete_form.ctp:22
@@ -333,6 +333,11 @@ msgstr "更新日時"
msgid "Modified user"
msgstr "更新者"
+
+#
+#: ボタン
+#
+
#: Announcements/View/Announcements/view.ctp:16
#: Bbses/View/Elements/BbsArticles/breadcrumb.ctp:63
#: Bbses/View/Elements/BbsArticles/edit_link.ctp:26
@@ -401,15 +406,57 @@ msgstr "追加"
msgid "Quit"
msgstr "終了"
+#: NetCommons/View/Elements/workflow_buttons.ctp:20
+#: Questionnaires/View/Elements/Questionnaires/workflow_buttons.ctp:22
+msgid "Disapproval"
+msgstr "差し戻し"
+
+#: NetCommons/View/Elements/workflow_buttons.ctp:28;36
+#: Questionnaires/View/Elements/Questionnaires/workflow_buttons.ctp:30;38
+msgid "Save temporally"
+msgstr "一時保存"
+
+#: Pages/View/Elements/add_plugin.ctp:78
+msgid "Close"
+msgstr "閉じる"
+
+#: Questionnaires/View/Elements/Questionnaires/workflow_buttons.ctp:16
+#: Questionnaires/View/QuestionnaireQuestions/edit_result.ctp:201
+msgid "BACK"
+msgstr "前へ"
+
+#: Questionnaires/View/QuestionnaireAnswers/answer.ctp:129
+#: Questionnaires/View/QuestionnaireAnswers/pre_answer.ctp:95
+#: Questionnaires/View/QuestionnaireQuestions/edit.ctp:367
+#: Questionnaires/View/QuestionnaireQuestions/edit_result.ctp:204
+#: Questionnaires/View/Questionnaires/add.ctp:119
+msgid "NEXT"
+msgstr "次へ"
+
+#: Questionnaires/View/QuestionnaireAnswers/confirm.ctp:92
+msgid "Confirm"
+msgstr "確認"
+
+msgid "Search"
+msgstr "検索"
+
+msgid "Select"
+msgstr "選択"
+
+msgid "Preview"
+msgstr "プレビュー"
+
+msgid "Move"
+msgstr "移動"
+
+msgid "To list"
+msgstr "一覧へ"
+
#
#: ラベル
#
-#: Faqs/View/Elements/FaqQuestions/select_status.ctp:21
-msgid "Display all"
-msgstr "全て表示"
-
#: Iframes/Model/Iframe.php:106
#: RssReaders/Test/Case/Model/RssReaderItemValidateRssReaderItemsTest.php:126
#: RssReaders/Test/Case/Model/RssReaderValidateRssReaderTest.php:174;211
@@ -428,6 +475,12 @@ msgstr "確認項目"
msgid "*"
msgstr ""
+msgid "Yes"
+msgstr "はい"
+
+msgid "No"
+msgstr "いいえ"
+
#
#: 承認の文言
@@ -521,72 +574,17 @@ msgstr "一覧表示"
#
-#: 画像認証
+#: 選択肢
#
-#: NetCommons/View/Elements/visual_captcha.ctp:34
-msgid "Sound icon"
-msgstr ""
-
-#: NetCommons/View/Elements/visual_captcha.ctp:35
-msgid "Accessibility option: listen to a question and answer it!"
-msgstr ""
-
-#: NetCommons/View/Elements/visual_captcha.ctp:36
-msgid "Type below the answer to what you hear. Numbers or words:"
-msgstr ""
-
-#: NetCommons/View/Elements/visual_captcha.ctp:37
-msgid "Click or touch the ANSWER"
-msgstr ""
-
-#: NetCommons/View/Elements/visual_captcha.ctp:38
-msgid "Refresh/reload icon"
-msgstr ""
-
-#: NetCommons/View/Elements/visual_captcha.ctp:39
-msgid "Refresh/reload: get new images and accessibility option!"
-msgstr ""
-
-#: NetCommons/View/Elements/workflow_buttons.ctp:20
-#: Questionnaires/View/Elements/Questionnaires/workflow_buttons.ctp:22
-msgid "Disapproval"
-msgstr "差し戻し"
-
-#: NetCommons/View/Elements/workflow_buttons.ctp:28;36
-#: Questionnaires/View/Elements/Questionnaires/workflow_buttons.ctp:30;38
-msgid "Save temporally"
-msgstr "一時保存"
-
-#: Pages/View/Elements/add_plugin.ctp:78
-msgid "Close"
-msgstr "閉じる"
-
-#: Pages/View/Elements/dropdown_menu.ctp:28
-msgid "Theme setting"
-msgstr "テーマ設定"
+#: Faqs/View/Elements/FaqQuestions/select_status.ctp:21
+msgid "Display all"
+msgstr "全て表示"
#: Questionnaires/View/Elements/edit_status_selector.ctp:28
msgid "All Display"
msgstr ""
-#: Questionnaires/View/Elements/Questionnaires/workflow_buttons.ctp:16
-#: Questionnaires/View/QuestionnaireQuestions/edit_result.ctp:201
-msgid "BACK"
-msgstr "前へ"
-
-#: Questionnaires/View/QuestionnaireAnswers/answer.ctp:129
-#: Questionnaires/View/QuestionnaireAnswers/pre_answer.ctp:95
-#: Questionnaires/View/QuestionnaireQuestions/edit.ctp:367
-#: Questionnaires/View/QuestionnaireQuestions/edit_result.ctp:204
-#: Questionnaires/View/Questionnaires/add.ctp:119
-msgid "NEXT"
-msgstr "次へ"
-
-#: Questionnaires/View/QuestionnaireAnswers/confirm.ctp:92
-msgid "Confirm"
-msgstr "確認"
-
msgid "All Plugins"
msgstr "全てのプラグイン"
@@ -596,9 +594,6 @@ msgstr "全てのステータス"
msgid "All Duration"
msgstr "全ての期間"
-msgid "Search"
-msgstr "検索"
-
msgid "%s item"
msgstr "%s件"
@@ -611,21 +606,6 @@ msgstr "%s日分"
msgid "%s days"
msgstr "%s日分"
-msgid "Select"
-msgstr "選択"
-
-msgid "Preview"
-msgstr "プレビュー"
-
-msgid "Move"
-msgstr "移動"
-
-msgid "Yes"
-msgstr "はい"
-
-msgid "No"
-msgstr "いいえ"
-
#
#: ソート
@@ -641,6 +621,35 @@ msgid "Title"
msgstr "タイトル順"
+#
+#: 画像認証
+#
+
+#: NetCommons/View/Elements/visual_captcha.ctp:34
+msgid "Sound icon"
+msgstr ""
+
+#: NetCommons/View/Elements/visual_captcha.ctp:35
+msgid "Accessibility option: listen to a question and answer it!"
+msgstr ""
+
+#: NetCommons/View/Elements/visual_captcha.ctp:36
+msgid "Type below the answer to what you hear. Numbers or words:"
+msgstr ""
+
+#: NetCommons/View/Elements/visual_captcha.ctp:37
+msgid "Click or touch the ANSWER"
+msgstr ""
+
+#: NetCommons/View/Elements/visual_captcha.ctp:38
+msgid "Refresh/reload icon"
+msgstr ""
+
+#: NetCommons/View/Elements/visual_captcha.ctp:39
+msgid "Refresh/reload: get new images and accessibility option!"
+msgstr ""
+
+
#
#: TitleIconName
#
diff --git a/View/Helper/BackToHelper.php b/View/Helper/BackToHelper.php
index 545f23ac..9afdb189 100644
--- a/View/Helper/BackToHelper.php
+++ b/View/Helper/BackToHelper.php
@@ -113,14 +113,26 @@ public function linkButton($title, $url, $options = array()) {
//ボタンサイズ
if (Hash::get($options, 'iconSize')) {
- $sizeAttr = h(' btn-' . $options['iconSize']);
+ $sizeAttr = h('btn-' . $options['iconSize']);
} else {
- $sizeAttr = $this->Button->getButtonSize();
+ $sizeAttr = trim($this->Button->getButtonSize());
}
$options = Hash::remove($options, 'iconSize');
+ //class属性
+ $class = Hash::get($options, 'class', array());
+ if (is_string($class)) {
+ $class = explode(' ', $class);
+ }
+ if ($sizeAttr) {
+ $class = array_merge(['btn', 'btn-default', $sizeAttr], $class);
+ } else {
+ $class = array_merge(['btn', 'btn-default'], $class);
+ }
+ $options = Hash::remove($options, 'class');
+
$inputOptions = Hash::merge(
- array('class' => 'btn btn-default' . $sizeAttr),
+ array('class' => $class),
$options,
array('escapeTitle' => false)
);
@@ -155,4 +167,20 @@ public function indexLinkButton($title, $defaultField = 'default_action', $optio
return $this->linkButton($title, $url, $options);
}
+/**
+ * 一覧へボタンHTMLの出力
+ *
+ * @param array $options HTML属性オプション
+ * @return string HTMLタグ
+ */
+ public function listLinkButton($options = array()) {
+ $options = Hash::merge(['icon' => 'list'], $options);
+ $title = __d('net_commons', 'To list');
+
+ $output = '';
+ $output .= $this->indexLinkButton($title, 'default_action', $options);
+
+ return $this->indexLinkButton($title, 'default_action', $options);
+ }
+
}
diff --git a/View/Helper/LinkButtonHelper.php b/View/Helper/LinkButtonHelper.php
index fe1ae937..62677b53 100644
--- a/View/Helper/LinkButtonHelper.php
+++ b/View/Helper/LinkButtonHelper.php
@@ -12,14 +12,14 @@
App::uses('FormHelper', 'View/Helper');
/**
- * LinkButton Helper
+ * ``のボタン Helper
*
* @package NetCommons\NetCommons\View\Helper
*/
class LinkButtonHelper extends FormHelper {
/**
- * Other helpers used by FormHelper
+ * 使用するヘルパ
*
* @var array
*/
@@ -31,13 +31,12 @@ class LinkButtonHelper extends FormHelper {
);
/**
- * Creates a `` tag for add link. The type attribute defaults
+ * 追加ボタンHTMLの出力
*
- * @param string $title The button's caption. Not automatically HTML encoded
- * @param mixed $url Link url
- * @param array $options Array of options and HTML attributes.
- * @return string A HTML button tag.
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::button
+ * @param string $title タイトル
+ * @param mixed $url URL
+ * @param array $options HTML属性オプション
+ * @return string HTMLタグ
*/
public function add($title = '', $url = null, $options = array()) {
$output = '';
@@ -96,13 +95,12 @@ public function add($title = '', $url = null, $options = array()) {
}
/**
- * Creates a `` tag for edit link link. The type attribute defaults
+ * 編集ボタンHTMLの出力
*
- * @param string $title The button's caption. Not automatically HTML encoded
- * @param mixed $url Link url
- * @param array $options Array of options and HTML attributes.
- * @return string A HTML button tag.
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::button
+ * @param string $title タイトル
+ * @param mixed $url URL
+ * @param array $options HTML属性オプション
+ * @return string HTMLタグ
*/
public function edit($title = '', $url = null, $options = array()) {
$output = '';
@@ -165,7 +163,6 @@ public function edit($title = '', $url = null, $options = array()) {
* @param mixed $url URL
* @param array $options HTML属性オプション
* @return string HTMLタグ
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::button
*/
public function search($title = '', $url = null, $options = array()) {
$output = '';
@@ -223,7 +220,6 @@ public function search($title = '', $url = null, $options = array()) {
* @param mixed $url URL
* @param array $options HTML属性オプション
* @return string HTMLタグ
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::button
*/
public function sort($title = '', $url = null, $options = array()) {
$output = '';
diff --git a/View/Helper/NetCommonsHtmlHelper.php b/View/Helper/NetCommonsHtmlHelper.php
index caf0f125..041bd401 100644
--- a/View/Helper/NetCommonsHtmlHelper.php
+++ b/View/Helper/NetCommonsHtmlHelper.php
@@ -199,15 +199,24 @@ public function link($title = '', $url = null, $options = array()) {
* ```
*
* @param string $text タイトル
+ * @param string $titleIcon タイトルアイコン
* @param array $options HTML属性オプション
* @return string ``タグ
*/
- public function blockTitle($text = '', $options = array()) {
+ public function blockTitle($text = '', $titleIcon = null, $options = array()) {
$output = '';
- $options = Hash::merge(
- array('escape' => true), $options
- );
+ if ($titleIcon) {
+ $text = $this->titleIcon($titleIcon) . ' ' . h($text);
+
+ $options = Hash::merge(
+ array('escape' => false), $options
+ );
+ } else {
+ $options = Hash::merge(
+ array('escape' => true), $options
+ );
+ }
$output .= $this->Html->tag('h1', $text, $options);
return $output;
diff --git a/webroot/css/style.css b/webroot/css/style.css
index ce3969b3..84886564 100644
--- a/webroot/css/style.css
+++ b/webroot/css/style.css
@@ -257,6 +257,13 @@ ul.nav-pills {
margin-left: 5px
}
+/**
+ * フレーム枠内
+ */
+.frame.nc-content header {
+ margin-bottom: 16px;
+}
+
/**
* フレーム枠内のh1,h2,h3,h4,h5,h6
*/