OSDN Git Service

(root) / magic3 / magic3.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 86b9a7e)
ブログメインウィジェット更新。
authornaoki hirata <naoki@magic3.org>
Sun, 22 Jan 2017 13:35:27 +0000 (22:35 +0900)
committernaoki hirata <naoki@magic3.org>
Sun, 22 Jan 2017 13:35:27 +0000 (22:35 +0900)
scripts/m3/ckconfig.js patch | blob | history
templates/_admin4/css/style.css patch | blob | history
widgets/blog_main/include/container/admin_blog_mainEntryWidgetContainer.php patch | blob | history
widgets/blog_main/include/template/admin_config.tmpl.html patch | blob | history
widgets/blog_main/include/template/admin_entry_detail.tmpl.html patch | blob | history
widgets/blog_main/include/template/admin_entry_detail_small.tmpl.html patch | blob | history

diff --git a/scripts/m3/ckconfig.js b/scripts/m3/ckconfig.js
index bedbf9e..5117726 100644 (file)
--- a/scripts/m3/ckconfig.js
+++ b/scripts/m3/ckconfig.js
@@ -163,7 +163,8 @@ CKEDITOR.editorConfig = function(config){
        config.autoParagraph = false;
        config.fillEmptyBlocks = false;         // 「&nbsp;」が自動的に入るのを防ぐ
        config.toolbarCanCollapse = true;               // ツールバー表示制御
-       config.width = 800;
+//     config.width = 800;
+       config.width = 796;             // IE Edgeのカラム幅に合わない問題を調整(2017/1/22)
        
        // ツールバーの設定
        if (M3_USE_GOOGLEMAPS){                 // GoogleMapsを使用する場合
diff --git a/templates/_admin4/css/style.css b/templates/_admin4/css/style.css
index ddb3337..a2fac50 100644 (file)
--- a/templates/_admin4/css/style.css
+++ b/templates/_admin4/css/style.css
@@ -601,6 +601,11 @@ span[rel="m3help"] { cursor: default; }
        margin: 0 auto 15px auto;
        width:100%;
 }
+@supports (-ms-ime-align:auto) {
+.m3config_table {
+/*     table-layout:fixed;*/   /* Edge column width trouble fixed */
+}
+}
 @media (min-width: 992px) {
 .m3config_table {
        margin: 0 auto 15px auto;
@@ -762,6 +767,9 @@ span[rel="m3help"] { cursor: default; }
        padding-right: 0;
 /*     padding-right: 5px;*/
 }
+.m3config_item.inline {
+       display: inline-block;
+}
 /*.m3config_item.join {
        padding-left: 0;
        padding-right: 5px;
diff --git a/widgets/blog_main/include/container/admin_blog_mainEntryWidgetContainer.php b/widgets/blog_main/include/container/admin_blog_mainEntryWidgetContainer.php
index 2e93337..b5a679a 100644 (file)
--- a/widgets/blog_main/include/container/admin_blog_mainEntryWidgetContainer.php
+++ b/widgets/blog_main/include/container/admin_blog_mainEntryWidgetContainer.php
@@ -57,6 +57,7 @@ class admin_blog_mainEntryWidgetContainer extends admin_blog_mainBaseWidgetConta
        const NO_BLOG_NAME = '所属なし';            // 所属ブログなし
        const TAG_ID_ACTIVE_TERM = 'activeterm_button';         // 公開期間エリア表示用ボタンタグ
        const TOOLTIP_ACTIVE_TERM = '公開期間を設定';            // 公開期間エリア表示用ボタンツールチップ
+       const DATETIME_FORMAT = 'Y年n月j日($1) H:i:s';               // 日付時間フォーマット
        
        /**
         * コンストラクタ
@@ -1004,6 +1005,15 @@ class admin_blog_mainEntryWidgetContainer extends admin_blog_mainBaseWidgetConta
                $this->tmpl->addVar('_widget', 'calendar_img', $this->getUrl($this->gEnv->getRootUrl() . self::CALENDAR_ICON_FILE));    // カレンダーアイコン
                $this->tmpl->addVar('_widget', 'current_widget', $this->_widgetId);             // AJAX用ウィジェットID
                
+               // 投稿日時
+               if ($this->_isSmallDeviceOptimize){                     // 小画面デバイス最適化の場合
+                       $resistDtTimestamp = strtotime($row['be_regist_dt']);
+                       $weekTypeArray = array('日', '月', '火', '水', '木', '金', '土');// 曜日表示名
+                       $datetimeStr = $date = date(self::DATETIME_FORMAT, $resistDtTimestamp);
+                       $datetimeStr = str_replace('$1', $weekTypeArray[intval(date('w', $resistDtTimestamp))], $datetimeStr);
+                       $this->tmpl->addVar("_widget", "entry_datetime_text", '<div class="form-control-static m3config_item">' . $datetimeStr . '</div>');
+               }
+                               
                // 記事状態ラベル
                if ($this->_isSmallDeviceOptimize){                     // 小画面デバイス最適化の場合
                        $statusLabelTag = '';
diff --git a/widgets/blog_main/include/template/admin_config.tmpl.html b/widgets/blog_main/include/template/admin_config.tmpl.html
index 0a54acb..052e59f 100644 (file)
--- a/widgets/blog_main/include/template/admin_config.tmpl.html
+++ b/widgets/blog_main/include/template/admin_config.tmpl.html
@@ -5,7 +5,7 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2015 Magic3 Project.\r
+ * @copyright  Copyright 2006-2017 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
diff --git a/widgets/blog_main/include/template/admin_entry_detail.tmpl.html b/widgets/blog_main/include/template/admin_entry_detail.tmpl.html
index 4664d7d..0556b19 100644 (file)
--- a/widgets/blog_main/include/template/admin_entry_detail.tmpl.html
+++ b/widgets/blog_main/include/template/admin_entry_detail.tmpl.html
@@ -199,8 +199,8 @@ $(function(){
        });\r
        \r
        // WYSIWYGエディター作成\r
-       m3SetWysiwygEditor('item_html', 300/* 高さ */);\r
-       m3SetWysiwygEditor('item_html2', 300/* 高さ */);\r
+       m3SetWysiwygEditor('item_html', 300/* 高さ */, true/*ツールバー表示*/, 'full', 788/*タブ表示用幅修正*/);\r
+       m3SetWysiwygEditor('item_html2', 300/* 高さ */, true/*ツールバー表示*/, 'full', 788/*タブ表示用幅修正*/);\r
        \r
        // 前後エントリー移動ボタン\r
        <patTemplate:tmpl name="show_prev_button" visibility="hidden">\r
diff --git a/widgets/blog_main/include/template/admin_entry_detail_small.tmpl.html b/widgets/blog_main/include/template/admin_entry_detail_small.tmpl.html
index 749ff66..7f363fd 100644 (file)
--- a/widgets/blog_main/include/template/admin_entry_detail_small.tmpl.html
+++ b/widgets/blog_main/include/template/admin_entry_detail_small.tmpl.html
@@ -254,19 +254,22 @@ $(function(){
            <th><span {_HELP_ENTRY_DT}>投稿日時</span></th>
        </tr>
        <tr>
-           <td>
-<div class="form-group"><div class="form-control-static col-sm-2 m3config_item" >日付：</div><div class="col-sm-4 m3config_item" ><input type="text" class="form-control" id="item_entry_date" name="item_entry_date" value="{ENTRY_DATE}" size="20" maxlength="10" /></div><div class="form-control-static col-sm-2 m3config_item" >時間：</div><div class="col-sm-4 m3config_item" ><input type="text" class="form-control" id="item_entry_time" name="item_entry_time" value="{ENTRY_TIME}" size="20" maxlength="10" /></div></div>
-               <!--日付<input type="text" id="item_entry_date" name="item_entry_date" value="{ENTRY_DATE}" size="10" maxlength="10" style="width:100px;" />&nbsp;&nbsp;時間<input type="text" id="item_entry_time" name="item_entry_time" value="{ENTRY_TIME}" size="10" maxlength="10" style="width:70px;" />-->
+           <td>{ENTRY_DATETIME_TEXT}
+               <div style="display:flex;">
+<div class="form-control-static m3config_item inline" style="width:4em;">日付：</div><div class="m3config_item inline" style="width:8em;"><input type="text" class="form-control" id="item_entry_date" name="item_entry_date" value="{ENTRY_DATE}" maxlength="10" /></div><div class="form-control-static m3config_item inline" style="margin-left:10px;width:4em;">時間：</div><div class="m3config_item inline" ><input type="text" class="form-control" id="item_entry_time" name="item_entry_time" value="{ENTRY_TIME}" maxlength="10" style="width:7em;" /></div>
+</div>
                </td>
        </tr>
-       <tr class="active_term_area" style="display:none;">
+       <tr class="active_term_area1">
            <th><span {_HELP_ENTRY_ACTIVE_TERM}>公開期間</span></th>
        </tr>
        <tr>
            <td>
-<div class="form-control-static col-sm-1 m3config_item" >開始日：</div><div class="col-sm-2 m3config_item" style="width:130px;"><input type="text" class="form-control" id="item_start_date" name="item_start_date" value="{START_DATE}" size="20" maxlength="10" /></div><div class="form-control-static col-sm-1" style="width:30px;padding-left:3px;"><a href="#" id="calenderbutton1"><img src="{CALENDAR_IMG}" alt="カレンダー" title="カレンダー" rel="m3help" /></a></div><div class="form-control-static col-sm-1 m3config_item" style="width:55px;">時間：</div><div class="col-sm-2 m3config_item" style="width:90px;"><input type="text" class="form-control" id="item_start_time" name="item_start_time" value="{START_TIME}" size="20" maxlength="10" /></div><div class="form-control-static col-sm-1" style="width:10px;padding-left:3px;margin-right:5px;">～</div>
-        <div class="form-control-static col-sm-1 m3config_item" >終了日：</div><div class="col-sm-2 m3config_item" style="width:130px;"><input type="text" class="form-control" id="item_end_date" name="item_end_date" value="{END_DATE}" size="20" maxlength="10" /></div><div class="form-control-static col-sm-1" style="width:30px;padding-left:3px;"><a href="#" id="calenderbutton2"><img src="{CALENDAR_IMG}" alt="カレンダー" title="カレンダー" rel="m3help" /></a></div><div class="form-control-static col-sm-1 m3config_item" style="width:55px;">時間：</div><div class="col-sm-2 m3config_item" style="width:90px;"><input type="text" class="form-control" id="item_end_time" name="item_end_time" value="{END_TIME}" size="20" maxlength="10" /></div>
-               <!--開始日：<input type="text" id="item_start_date" name="item_start_date" value="{START_DATE}" size="15" maxlength="10" style="width:100px;" /><a href="#" id="calenderbutton1"><img src="{CALENDAR_IMG}" alt="カレンダー" title="カレンダー" border="0" /></a>&nbsp;&nbsp;時間：<input type="text" id="item_start_time" name="item_start_time" value="{START_TIME}" size="15" maxlength="10" style="width:100px;" />&nbsp;&nbsp;～&nbsp;&nbsp;終了日：<input type="text" id="item_end_date" name="item_end_date" value="{END_DATE}" size="15" maxlength="10" style="width:100px;" /><a href="#" id="calenderbutton2"><img src="{CALENDAR_IMG}" alt="カレンダー" title="カレンダー" border="0" /></a>&nbsp;&nbsp;時間：<input type="text" id="item_end_time" name="item_end_time" value="{END_TIME}" size="15" maxlength="10" style="width:100px;" />-->
+               <div>
+<div class="form-control-static m3config_item inline" style="width:4em;">開始日：</div><div class="m3config_item inline" style="width:9em;"><input type="text" class="form-control" id="item_start_date" name="item_start_date" value="{START_DATE}" maxlength="10" /></div><div class="form-control-static m3config_item inline" style="width:30px;padding-left:3px;"><a href="#" id="calenderbutton1"><img src="{CALENDAR_IMG}" alt="カレンダー" title="カレンダー" rel="m3help" /></a></div><div class="form-control-static m3config_item inline" style="width:4em;">時間：</div><div class="m3config_item inline" style="width:4em;"><input type="text" class="form-control" id="item_start_time" name="item_start_time" value="{START_TIME}" maxlength="10" /></div><div class="form-control-static m3config_item inline" style="width:10px;padding-left:3px;margin-right:5px;">～</div>
+        </div><div>
+        <div class="form-control-static m3config_item inline" style="width:4em;">終了日：</div><div class="m3config_item inline" style="width:9em;"><input type="text" class="form-control" id="item_end_date" name="item_end_date" value="{END_DATE}" maxlength="10" /></div><div class="form-control-static m3config_item inline" style="width:30px;padding-left:3px;"><a href="#" id="calenderbutton2"><img src="{CALENDAR_IMG}" alt="カレンダー" title="カレンダー" rel="m3help" /></a></div><div class="form-control-static m3config_item inline" style="width:4em;">時間：</div><div class="m3config_item inline" style="width:9em;"><input type="text" class="form-control" id="item_end_time" name="item_end_time" value="{END_TIME}" maxlength="10" /></div>
+               </div>
                </td>
        </tr>
     <tr>
Cloud computing platform
About OSDN
Find Software
Develop Software
Help