1
0
Эх сурвалжийг харах

1,优化截图字段提示信息和处理。
2,更新标签文档。
3,其他细节。

magicblack 4 жил өмнө
parent
commit
099c14a48c

+ 1 - 1
application/admin/view/art/info.html

@@ -175,7 +175,7 @@
                     </div>
                     <div class="layui-form-item">
                         <div class="layui-input-block">
-                            <textarea id="art_pic_screenshot" name="art_pic_screenshot" type="text/plain" style="width:100%;height:150px;">{$info.art_pic_screenshot|mac_str_correct=###,'#',chr(13)}</textarea>
+                            <textarea id="art_pic_screenshot" name="art_pic_screenshot" placeholder="{:lang('screenshot_tip')}" type="text/plain" style="width:100%;height:150px;">{$info.art_pic_screenshot|mac_str_correct=###,'#',chr(13)}</textarea>
                             <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
                                 <legend>{:lang('screenshot_preview')}</legend>
                             </fieldset>

+ 1 - 1
application/admin/view/vod/info.html

@@ -300,7 +300,7 @@
                     </div>
                     <div class="layui-form-item">
                         <div class="layui-input-block">
-                            <textarea id="vod_pic_screenshot" name="vod_pic_screenshot" type="text/plain" style="width:100%;height:150px;">{$info.vod_pic_screenshot|mac_str_correct=###,'#',chr(13)}</textarea>
+                            <textarea id="vod_pic_screenshot" name="vod_pic_screenshot" placeholder="{:lang('screenshot_tip')}" type="text/plain" style="width:100%;height:150px;">{$info.vod_pic_screenshot|mac_str_correct=###,'#',chr(13)}</textarea>
                             <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
                                 <legend>{:lang('screenshot_preview')}</legend>
                             </fieldset>

+ 1 - 1
application/admin/view/website/info.html

@@ -165,7 +165,7 @@
                     </div>
                     <div class="layui-form-item">
                         <div class="layui-input-block">
-                            <textarea id="website_pic_screenshot" name="website_pic_screenshot" type="text/plain" style="width:100%;height:150px;">{$info.website_pic_screenshot|mac_str_correct=###,'#',chr(13)}</textarea>
+                            <textarea id="website_pic_screenshot" name="website_pic_screenshot" placeholder="{:lang('screenshot_tip')}" type="text/plain" style="width:100%;height:150px;">{$info.website_pic_screenshot|mac_str_correct=###,'#',chr(13)}</textarea>
                             <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
                                 <legend>{:lang('screenshot_preview')}</legend>
                             </fieldset>

+ 2 - 2
application/common.php

@@ -1238,10 +1238,10 @@ function mac_screenshot_list($screenshot)
         list($title, $url) = explode('$', $val);
         if ( empty($url) ) {
             $url_list[$key+1]['name'] = ($key+1);
-            $url_list[$key+1]['url'] = mac_url_img($title);
+            $url_list[$key+1]['url'] = $title;
         }else{
             $url_list[$key+1]['name'] = $title;
-            $url_list[$key+1]['url'] = mac_url_img($url);
+            $url_list[$key+1]['url'] = $url;
         }
     }
     return $url_list;

+ 1 - 1
application/extra/version.php

@@ -3,7 +3,7 @@ return array (
     'name' => '苹果CMS内容管理系统',
     'copyright' => 'MacCMS',
     'url' => '//github.com/magicblack',
-    'code' => '2020.1000.1065',
+    'code' => '2020.1000.1066',
     'license' => '免费版',
 );
 ?>

+ 6 - 1
application/lang/zh-cn.php

@@ -7,7 +7,7 @@
 *内部处理key:开头 model/、controller/、只在模块内使用
 */
 return [
-    'lang_ver'=>'1064+',
+    'lang_ver'=>'1065+',
     'hello'  => '欢迎使用',
     'maccms_name'=>'苹果CMS-v10',
     'maccms_copyright'=>'© MacCMS All Rights Reserved.',
@@ -483,6 +483,11 @@ return [
     'rel_name'=>'关联数据名称',
     'preview'=>'预览',
     'screenshot_preview'=>'截图预览',
+    'screenshot_tip'=>'每行一个图片地址支持远程url、本地路径、自定义名称备注,例如:
+图1$upload/test.jpg
+图2$https://www.baidu.com/logo.png
+https://www.baidu.com/123.jpg
+    ',
 
     'menu/index'=>'首页',
     'menu/welcome'=>'欢迎页面',

+ 6 - 1
application/lang/zh-tw.php

@@ -7,7 +7,7 @@
 *內部處理key:開頭 model/、controller/、只在模塊內使用
 */
 return [
-    'lang_ver'=>'1064+',
+    'lang_ver'=>'1065+',
     'hello'  => '歡迎使用',
     'maccms_name'=>'蘋果CMS-v10',
     'maccms_copyright'=>'© MacCMS All Rights Reserved.',
@@ -483,6 +483,11 @@ return [
     'rel_name'=>'關聯數據名稱',
     'preview'=>'預覽',
     'screenshot_preview'=>'截圖預覽',
+    'screenshot_tip'=>'每行壹個圖片地址支持遠程url、本地路徑、自定義名稱備註,例如:
+圖1$upload/test.jpg
+圖2$https://www.baidu.com/logo.png
+https://www.baidu.com/123.jpg
+    ',
 
     'menu/index'=>'首頁',
     'menu/welcome'=>'歡迎頁面',

+ 4 - 6
说明文档/标签说明.txt

@@ -496,12 +496,10 @@ plot是否包含分集剧情 0,1
 {:mac_url_vod_down($obj,'first')}   视频下载页第一条链接
 
 
-多个截图获取调用例子
-{notempty name="$obj.vod_pic_screenshot"}
-{volist name=":explode('$$$',$obj.vod_pic_screenshot);" id="vo2"}
-    <img src="{:mac_url_img($vo2)}" >
-{/volist}
-{/notempty}
+=======多个截图获取调用例子=======
+{maccms:foreach name="obj.vod_pic_screenshot_list" id="vo"}
+    <img src="{$vo.url}" alt="{$vo.name}" />
+{/maccms:foreach}
 
 =======视频播放地址和下载地址标签=======