ページの表示状況によるウィジェットの表示制御機能を追加。

diff --git a/include/sql/sample/event_demo.sql b/include/sql/sample/_event_demo.sql
similarity index 100%
rename from include/sql/sample/event_demo.sql
rename to include/sql/sample/_event_demo.sql

diff --git a/widgets/admin_main/include/container/admin_mainAdjustwidgetWidgetContainer.php b/widgets/admin_main/include/container/admin_mainAdjustwidgetWidgetContainer.php
index 79dc086..7d48d22 100644 (file)
--- a/widgets/admin_main/include/container/admin_mainAdjustwidgetWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainAdjustwidgetWidgetContainer.php
@@ -170,6 +170,7 @@ class admin_mainAdjustwidgetWidgetContainer extends admin_mainBaseWidgetContaine
                // 「表示制御」設定
                $shared = ($request->trimValueOf('item_shared') == 'on') ? 1 : 0;               // 共通属性があるかどうか
                $viewControlType = $request->trimValueOf('item_view_type');                     // 表示制御タイプ
+               $viewControlPageState = $request->trimValueOf('item_view_page_state');                  // ページ状況での表示制御タイプ
                $cssClassSuffix = $request->trimValueOf('item_css_class_suffix');                       // 追加CSSクラスサフィックス
                
                // 例外ページ
@@ -285,6 +286,7 @@ class admin_mainAdjustwidgetWidgetContainer extends admin_mainBaseWidgetContaine
                                $updateData['pd_active_start_dt'] = $startDt;
                                $updateData['pd_active_end_dt'] = $endDt;
                                $updateData['pd_view_control_type'] = $viewControlType;         // 表示制御タイプ
+                               $updateData['pd_view_page_state'] = $viewControlPageState;                      // ページ状況での表示制御タイプ
                                
                                // 例外ページ
                                $exceptPageStr = '';
@@ -390,6 +392,7 @@ class admin_mainAdjustwidgetWidgetContainer extends admin_mainBaseWidgetContaine
                        // 「表示制御」設定
                        $shared = 0;            // 共通属性があるかどうか
                        $viewControlType = 0;           // 表示制御タイプ
+                       $viewControlPageState = 0;                      // ページ状況での表示制御タイプ
                        $this->exceptPageArray = array();               // 例外ページ
                        $start_date = '';       // 公開期間開始日
                        $start_time = '';       // 公開期間開始時間
@@ -453,6 +456,7 @@ class admin_mainAdjustwidgetWidgetContainer extends admin_mainBaseWidgetContaine
                                $shared = 0;            // 共通属性があるかどうか
                                if (empty($row['pd_sub_id'])) $shared = 1;      // 共通ウィジェットのとき
                                $viewControlType = $row['pd_view_control_type'];                // 表示制御タイプ
+                               $viewControlPageState = $row['pd_view_page_state'];                     // ページ状況での表示制御タイプ
                                $start_date = $this->convertToDispDate($row['pd_active_start_dt']);     // 公開期間開始日
                                $start_time = $this->convertToDispTime($row['pd_active_start_dt'], 1/*時分*/);        // 公開期間開始時間
                                $end_date = $this->convertToDispDate($row['pd_active_end_dt']); // 公開期間終了日
@@ -499,8 +503,6 @@ class admin_mainAdjustwidgetWidgetContainer extends admin_mainBaseWidgetContaine
                $this->tmpl->addVar("_widget", "remove_list_marker", $this->convertToCheckedString($removeListMarker));         // リストのマーカーを削除するかどうか
                        
                // 「表示制御」設定
-               $checked = '';
-               if ($shared) $checked = 'checked';              // 共通属性があるかどうか
                switch ($viewControlType){              // 表示制御タイプ
                        case 0:         // 常時表示
                        default:
@@ -513,7 +515,16 @@ class admin_mainAdjustwidgetWidgetContainer extends admin_mainBaseWidgetContaine
                                $this->tmpl->addVar("_widget", "checked_no_login", 'checked');
                                break;
                }
-               $this->tmpl->addVar("_widget", "shared_checked", $checked);
+               switch ($viewControlPageState){         // ページ状況での表示制御タイプ
+                       case 0:         // 常時表示
+                       default:
+                               $this->tmpl->addVar("_widget", "checked_view_page_state_always", 'checked');
+                               break;
+                       case 1:         // ログイン時のみ表示
+                               $this->tmpl->addVar("_widget", "checked_view_page_state_top_only", 'checked');
+                               break;
+               }
+               $this->tmpl->addVar("_widget", "shared_checked", $this->convertToCheckedString($shared));// 共通属性があるかどうか
                $this->tmpl->addVar("_widget", "start_date", $start_date);      // 公開期間開始日
                $this->tmpl->addVar("_widget", "start_time", $start_time);      // 公開期間開始時間
                $this->tmpl->addVar("_widget", "end_date", $end_date);  // 公開期間終了日
@@ -658,10 +669,13 @@ class admin_mainAdjustwidgetWidgetContainer extends admin_mainBaseWidgetContaine
                $localeText['label_hour'] = $this->_('Hour:');          // 時間
                $localeText['label_calendar'] = $this->_('Calendar');           // カレンダー
                $localeText['label_view_option'] = $this->_('View Option');             // 表示オプション
-               $localeText['label_view_type'] = $this->_('View Type');         // 表示表示タイプ
+               $localeText['label_view_login_state'] = $this->_('Login State');                // ログイン状況
+               $localeText['label_view_page_state'] = $this->_('Page State');          // ページ状況
                $localeText['label_always'] = $this->_('Always');               // 常時表示
                $localeText['label_login'] = $this->_('When user in login');            // ログイン時のみ表示
                $localeText['label_no_login'] = $this->_('When user not in login');             // 非ログイン時のみ表示
+               $localeText['label_view_page_state_always'] = $this->_('Always');               // 常時表示
+               $localeText['label_view_page_state_top_only'] = $this->_('Top only');           // トップ時のみ表示
                $localeText['label_update'] = $this->_('Update');// 更新
                
                $localeText['label_style'] = $this->_('Style');// スタイル

diff --git a/widgets/admin_main/include/locale/ja_JP.mo b/widgets/admin_main/include/locale/ja_JP.mo
index 6e96ff6..3e68013 100644 (file)
Binary files a/widgets/admin_main/include/locale/ja_JP.mo and b/widgets/admin_main/include/locale/ja_JP.mo differ

diff --git a/widgets/admin_main/include/locale/ja_JP.po b/widgets/admin_main/include/locale/ja_JP.po
index ddf820c..be764e0 100644 (file)
--- a/widgets/admin_main/include/locale/ja_JP.po
+++ b/widgets/admin_main/include/locale/ja_JP.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-22 20:10+0900\n"
-"PO-Revision-Date: 2015-02-22 20:11+0900\n"
+"POT-Creation-Date: 2015-03-29 11:26+0900\n"
+"PO-Revision-Date: 2015-03-29 11:28+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja_JP\n"
@@ -33,27 +33,27 @@ msgid "Right"
 msgstr "右"
 
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:101
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:626
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:627
 msgid "Basic"
 msgstr "基本"
 
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:109
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:627
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:628
 #: ../container/admin_mainEditmenuWidgetContainer.php:199
 #: ../container/admin_mainUserlistWidgetContainer.php:158
 msgid "Others"
 msgstr "その他"
 
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:116
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:628
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:650
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:629
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:651
 #: ../help/help_adjustwidget.php:39
 msgid "View Control"
 msgstr "表示制御"
 
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:123
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:629
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:666
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:630
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:670
 msgid "Style"
 msgstr "スタイル"
 
@@ -97,17 +97,17 @@ msgstr "データ更新に失敗しました"
 msgid "Invalid view term."
 msgstr "表示期間が不正です"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:624
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:625
 #: ../container/admin_mainConfigsiteWidgetContainer.php:246
 msgid "Update config?"
 msgstr "設定を更新しますか?"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:630
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:631
 #: ../help/help_adjustwidget.php:35
 msgid "Adjust Widget Title and Contents"
 msgstr "ウィジェットタイトル、位置調整"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:631
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:632
 #: ../container/admin_mainEditmenuWidgetContainer.php:56
 #: ../container/admin_mainMenudefWidgetContainer.php:173
 #: ../container/admin_mainSmenudefWidgetContainer.php:167
@@ -115,7 +115,7 @@ msgstr "ウィジェットタイトル、位置調整"
 msgid "Title"
 msgstr "タイトル"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:632
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:633
 #: ../container/admin_mainMenudefWidgetContainer.php:172
 #: ../container/admin_mainMenudefWidgetContainer.php:197
 #: ../container/admin_mainPagedefWidgetContainer.php:163
@@ -125,135 +125,144 @@ msgstr "タイトル"
 msgid "Visible"
 msgstr "表示"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:633
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:634
 msgid "Margin"
 msgstr "マージン"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:634
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:635
 msgid "Top:"
 msgstr "上："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:635
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:636
 msgid "Bottom:"
 msgstr "下："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:636
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:637
 msgid "Left:"
 msgstr "左："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:637
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:638
 msgid "Right:"
 msgstr "右："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:638
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:639
 #: ../help/help_adjustwidget.php:47
 msgid "Contents Position"
 msgstr "テキスト表示位置"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:639
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:640
 #: ../help/help_adjustwidget.php:55
 msgid "Render"
 msgstr "描画処理"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:640
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:641
 msgid "Render by Joomla! style"
 msgstr "Joomla!スタイルの描画処理を使用"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:641
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:642
 #: ../help/help_adjustwidget.php:59
 msgid "Additional Top Content"
 msgstr "補助コンテンツ(上)"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:642
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:643
 #: ../help/help_adjustwidget.php:63
 msgid "Additional Bottom Content"
 msgstr "補助コンテンツ(下)"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:643
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:644
 #: ../help/help_adjustwidget.php:67
 msgid "Readmore Button"
 msgstr "もっと読むボタン"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:644
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:645
 msgid "Title:"
 msgstr "タイトル："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:645
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:646
 msgid "Url:"
 msgstr "URL："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:646
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:647
 msgid "CSS"
 msgstr "CSS"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:647
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:648
 msgid "Configure for Joomla! style template"
 msgstr "Joomla!スタイルテンプレート用の設定"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:648
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:649
 msgid "Remove list marker"
 msgstr "リストのマーカーを削除"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:651
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:652
 #: ../help/help_adjustwidget.php:71
 msgid "Page Shared Attribute"
 msgstr "ページ共通属性"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:652
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:653
 msgid "On"
 msgstr "オン"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:653
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:654
 #: ../help/help_adjustwidget.php:75
 msgid "View Term"
 msgstr "表示期間"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:654
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:655
 msgid "Except Page"
 msgstr "例外ページ"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:655
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:656
 #: ../container/admin_mainUserlistWidgetContainer.php:129
 msgid "Start Date:"
 msgstr "開始日："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:656
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:657
 #: ../container/admin_mainUserlistWidgetContainer.php:130
 msgid "End Date:"
 msgstr "終了日："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:657
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:658
 #: ../container/admin_mainUserlistWidgetContainer.php:131
 msgid "Hour:"
 msgstr "時間："
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:658
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:659
 #: ../container/admin_mainUserlistWidgetContainer.php:136
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:659
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:660
 #: ../help/help_adjustwidget.php:79
 msgid "View Option"
 msgstr "表示オプション"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:660
-msgid "View Type"
-msgstr "表示タイプ"
-
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:661
+msgid "Login State"
+msgstr "ログイン状況"
+
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:662
+msgid "Page State"
+msgstr "ページ状況"
+
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:663
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:666
 msgid "Always"
 msgstr "常時表示"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:662
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:664
 msgid "When user in login"
 msgstr "ログイン時のみ表示"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:663
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:665
 msgid "When user not in login"
 msgstr "非ログイン時のみ表示"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:664
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:667
+msgid "Top only"
+msgstr "トップ時のみ表示"
+
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:668
 #: ../container/admin_mainConfigsiteWidgetContainer.php:262
 #: ../container/admin_mainEditmenuWidgetContainer.php:184
 #: ../container/admin_mainEditmenuWidgetContainer.php:202
@@ -264,25 +273,25 @@ msgstr "非ログイン時のみ表示"
 msgid "Update"
 msgstr "更新"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:667
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:671
 #: ../container/admin_mainEditmenuWidgetContainer.php:193
 #: ../container/admin_mainEditmenuWidgetContainer.php:559
 msgid "Widget"
 msgstr "ウィジェット"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:668
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:672
 msgid "Element ID"
 msgstr "エレメントID"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:669
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:673
 msgid "Dynamic"
 msgstr "動的"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:670
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:674
 msgid "Replace Tag"
 msgstr "置換タグ"
 
-#: ../container/admin_mainAdjustwidgetWidgetContainer.php:671
+#: ../container/admin_mainAdjustwidgetWidgetContainer.php:675
 msgid "Additional CSS Class"
 msgstr "追加CSSクラス"
 
@@ -3003,6 +3012,9 @@ msgstr ""
 "ウィジェットディレクトリを再読み込みして、一覧に表示されていないウィジェット"
 "を自動的にインストールします。"
 
+#~ msgid "View Type"
+#~ msgstr "表示タイプ"
+
 #~ msgid "Config Window"
 #~ msgstr "設定画面"
 

diff --git a/widgets/admin_main/include/template/adjustwidget.tmpl.html b/widgets/admin_main/include/template/adjustwidget.tmpl.html
index e9f287f..bcaa6ca 100644 (file)
--- a/widgets/admin_main/include/template/adjustwidget.tmpl.html
+++ b/widgets/admin_main/include/template/adjustwidget.tmpl.html
@@ -243,10 +243,13 @@ $(function(){
     <tr>
            <th><span {_HELP_ADJUSTWIDGET_OPTION}>{_LC_LABEL_VIEW_OPTION}</span></th>
            <td>
-                   <h4>{_LC_LABEL_VIEW_TYPE}</h4>
+                   <h4>{_LC_LABEL_VIEW_LOGIN_STATE}</h4>
                <div class="radio"><label><input type="radio" name="item_view_type" value="0" {CHECKED_ALWAYS} />{_LC_LABEL_ALWAYS}</label></div>
                        <div class="radio"><label><input type="radio" name="item_view_type" value="1" {CHECKED_LOGIN} />{_LC_LABEL_LOGIN}</label></div>
                        <div class="radio"><label><input type="radio" name="item_view_type" value="2" {CHECKED_NO_LOGIN} />{_LC_LABEL_NO_LOGIN}</label></div>
+                   <h4>{_LC_LABEL_VIEW_PAGE_STATE}</h4>
+               <div class="radio"><label><input type="radio" name="item_view_page_state" value="0" {CHECKED_VIEW_PAGE_STATE_ALWAYS} />{_LC_LABEL_VIEW_PAGE_STATE_ALWAYS}</label></div>
+                       <div class="radio"><label><input type="radio" name="item_view_page_state" value="1" {CHECKED_VIEW_PAGE_STATE_TOP_ONLY} />{_LC_LABEL_VIEW_PAGE_STATE_TOP_ONLY}</label></div>
            </td>
        </tr>
     </tbody>