フォトメインウィジェット更新。

diff --git a/widgets/photo_main/include/container/admin_photo_mainImagebrowseWidgetContainer.php b/widgets/photo_main/include/container/admin_photo_mainImagebrowseWidgetContainer.php
index 87f9c77..27ffb67 100644 (file)
--- a/widgets/photo_main/include/container/admin_photo_mainImagebrowseWidgetContainer.php
+++ b/widgets/photo_main/include/container/admin_photo_mainImagebrowseWidgetContainer.php
@@ -75,10 +75,10 @@ class admin_photo_mainImagebrowseWidgetContainer extends admin_photo_mainBaseWid
                switch ($task){
                        case self::TASK_IMAGEBROWSE:
                        default:
-                               $filename = 'imagebrowse.tmpl.html';
+                               $filename = 'admin_imagebrowse.tmpl.html';
                                break;
                        case self::TASK_IMAGEBROWSE_DETAIL:
-                               $filename = 'imagebrowse_detail.tmpl.html';
+                               $filename = 'admin_imagebrowse_detail.tmpl.html';
                                break;
                        case self::TASK_IMAGEBROWSE_DIRECT:
                                $filename = '';

diff --git a/widgets/photo_main/include/template/imagebrowse.tmpl.html b/widgets/photo_main/include/template/admin_imagebrowse.tmpl.html
similarity index 100%
rename from widgets/photo_main/include/template/imagebrowse.tmpl.html
rename to widgets/photo_main/include/template/admin_imagebrowse.tmpl.html

diff --git a/widgets/photo_main/include/template/imagebrowse_detail.tmpl.html b/widgets/photo_main/include/template/admin_imagebrowse_detail.tmpl.html
similarity index 68%
rename from widgets/photo_main/include/template/imagebrowse_detail.tmpl.html
rename to widgets/photo_main/include/template/admin_imagebrowse_detail.tmpl.html
index 8448bf4..0003bf2 100644 (file)
--- a/widgets/photo_main/include/template/imagebrowse_detail.tmpl.html
+++ b/widgets/photo_main/include/template/admin_imagebrowse_detail.tmpl.html
@@ -5,7 +5,7 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2014 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
@@ -76,72 +76,72 @@ $(function(){
 <table class="simple-table" style="margin: 0 auto;width:950px;">\r
     <tbody>\r
     <tr>\r
-           <td class="table-headside" width="150"><span {_HELP_IMAGEBROWSE_PUBLIC_ID}>公開ID</span></td>\r
+           <th><span {_HELP_IMAGEBROWSE_PUBLIC_ID}>公開ID</span></th>\r
            <td width="450">{PHOTO_ID}</td>\r
-           <td class="table-headside" width="150"><span {_HELP_IMAGEBROWSE_CODE}>画像コード</span></td>\r
+           <th><span {_HELP_IMAGEBROWSE_CODE}>画像コード</span></th>\r
            <td>{CODE}</td>\r
        </tr>\r
-    <tr class="even">\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_TITLE}>タイトル名</span></td>\r
-           <td ><input type="text" name="item_name" value="{NAME}" size="40" maxlength="40" style="width:100%;"/><br />元のファイル名：{ORIGINAL_NAME}</td>\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_AUTHOR}>撮影者</span></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_TITLE}>タイトル名</span></th>\r
+           <td ><input type="text" name="item_name" value="{NAME}" maxlength="40" style="width:100%;"/><br />元のファイル名：{ORIGINAL_NAME}</td>\r
+           <th><span {_HELP_IMAGEBROWSE_AUTHOR}>撮影者</span></th>\r
            <td>{AUTHOR}</td>\r
        </tr>\r
-        <tr>\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_VISIBLE}>公開</span></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_VISIBLE}>公開</span></th>\r
            <td><input type="checkbox" name="item_visible" {VISIBLE} /></td>\r
-           <td class="table-headside" width="150"><span {_HELP_IMAGEBROWSE_SORT_ORDER}>表示順</span></td>\r
+           <th><span {_HELP_IMAGEBROWSE_SORT_ORDER}>表示順</span></th>\r
            <td><input type="text" name="item_sort_order" value="{SORT_ORDER}" size="10" maxlength="10" onkeypress="return m3_numericKey(event,true);" /></td>\r
-           <!--<td class="table-headside" width="150"><span {_HELP_IMAGEBROWSE_LIMITED}>ユーザ制限</span></td>\r
+           <!--<th><span {_HELP_IMAGEBROWSE_LIMITED}>ユーザ制限</span></th>\r
            <td><input type="checkbox" name="item_limited" {SEL_ITEM_LIMITED} /></td>-->\r
        </tr>\r
-        <tr class="even">\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_IMAGE}>画像</span><br /><input type="button" class="button" onclick="showOriginal();" value="オリジナル画像" /></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_IMAGE}>画像</span><br /><input type="button" class="button" onclick="showOriginal();" value="オリジナル画像" /></th>\r
            <td colspan="3">{IMAGE_TAG}</td>\r
        </tr>\r
-        <tr>\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_FORMAT}>フォーマット</span></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_FORMAT}>フォーマット</span></th>\r
            <td>{FORMAT}</td>\r
-           <td class="table-headside" width="150"><span {_HELP_IMAGEBROWSE_SIZE}>画像サイズ(横x縦)</span></td>\r
+           <th><span {_HELP_IMAGEBROWSE_SIZE}>画像サイズ(横x縦)</span></th>\r
            <td>{SIZE}</td>\r
        </tr>\r
        <patTemplate:tmpl name="show_photo_date">\r
-    <tr class="even">\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_DATE}>撮影日</span></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_DATE}>撮影日</span></th>\r
            <td colspan="3"><input type="text" id="item_date" name="item_date" value="{DATE}" size="15" maxlength="10" /><a href="#" id="calenderbutton1"><img src="{CALENDAR_IMG}" alt="カレンダー" title="カレンダー" border="0" /></a></td>\r
        </tr>\r
        </patTemplate:tmpl>\r
        <patTemplate:tmpl name="show_photo_location">\r
     <tr>\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_LOCATION}>撮影場所</span></td>\r
+           <th><span {_HELP_IMAGEBROWSE_LOCATION}>撮影場所</span></th>\r
            <td colspan="3"><input type="text" name="item_location" value="{LOCATION}" size="120" maxlength="150" style="width:100%;" /></td>\r
        </tr>\r
        </patTemplate:tmpl>\r
        <patTemplate:tmpl name="show_photo_camera">\r
-    <tr class="even">\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_CAMERA}>カメラ</span></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_CAMERA}>カメラ</span></th>\r
            <td colspan="3"><input type="text" name="item_camera" value="{CAMERA}" size="120" maxlength="150" style="width:100%;" /></td>\r
        </tr>\r
        </patTemplate:tmpl>\r
-    <tr class="even">\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_SUMMARY}>概要</span></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_SUMMARY}>概要</span></th>\r
            <td colspan="3"><input type="text" name="item_summary" value="{SUMMARY}" size="120" maxlength="150" style="width:100%;" /></td>\r
        </tr>\r
        <patTemplate:tmpl name="show_photo_description">\r
     <tr>\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_DESCRIPTION}>説明</span></td>\r
+           <th><span {_HELP_IMAGEBROWSE_DESCRIPTION}>説明</span></th>\r
            <td colspan="3"><textarea name="item_description" style="width:100%;height:100%;">{DESCRIPTION}</textarea></td>\r
        </tr>\r
        </patTemplate:tmpl>\r
        <patTemplate:tmpl name="show_photo_keyword">\r
-    <tr class="even">\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_KEYWORD}>検索キーワード</span></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_KEYWORD}>検索キーワード</span></th>\r
            <td colspan="3" height="50"><textarea name="item_keyword" style="width:100%;height:100%;">{KEYWORD}</textarea></td>\r
        </tr>\r
        </patTemplate:tmpl>\r
        <patTemplate:tmpl name="show_photo_category">\r
     <tr>\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_CATEGORY}>カテゴリー</span></td>\r
+           <th><span {_HELP_IMAGEBROWSE_CATEGORY}>カテゴリー</span></th>\r
            <td colspan="3">\r
     <patTemplate:tmpl name="category">\r
     <select name="item_category{INDEX}">\r
@@ -154,8 +154,8 @@ $(function(){
            </td>\r
        </tr>\r
        </patTemplate:tmpl>\r
-    <tr class="even">\r
-           <td class="table-headside"><span {_HELP_IMAGEBROWSE_PUBLIC_URL}>公開画像</span><br /><input type="button" class="button" onclick="recreateImage();" value="再作成" /></td>\r
+    <tr>\r
+           <th><span {_HELP_IMAGEBROWSE_PUBLIC_URL}>公開画像</span><br /><input type="button" class="button" onclick="recreateImage();" value="再作成" /></th>\r
            <td colspan="3">サイズ調整画像：{PUBLIC_IMAGE_URL}<br />サムネール：{THUMBNAIL_URL}\r
            </td>\r
        </tr>\r