diff --git a/application/admin/controller/Plugs.php b/application/admin/controller/Plugs.php index d0a8e880a..02e359d63 100644 --- a/application/admin/controller/Plugs.php +++ b/application/admin/controller/Plugs.php @@ -29,8 +29,16 @@ class Plugs extends BasicAdmin { * 文件上传 */ public function upfile() { + $this->assign('field', $this->request->get('field', 'file')); + $this->assign('types', ''); + $this->assign('mimes', ''); + $this->assign('uptype', ''); return view(); } + + public function upload(){ + + } /** * 字体图标 diff --git a/application/admin/view/config.index.html b/application/admin/view/config.index.html index 1fae75e83..8c9efb101 100644 --- a/application/admin/view/config.index.html +++ b/application/admin/view/config.index.html @@ -107,6 +107,7 @@ + 上传图片
建议上传ICO图标的尺寸为128x128px，此图标用于网站标题前，ICON在线制作。 diff --git a/application/admin/view/plugs.upfile.html b/application/admin/view/plugs.upfile.html index c627c249c..6c53c740d 100644 --- a/application/admin/view/plugs.upfile.html +++ b/application/admin/view/plugs.upfile.html @@ -1,16 +1,540 @@ - - + - TODO supply a title - - + <{'app_name'|sysconf}> <{'app_version'|sysconf}> + + + + + + + + + -
TODO write content
+
+
+
+
+
+
+ +
+ diff --git a/public/static/admin/listen.js b/public/static/admin/listen.js index 1d95d6f57..8e7ad0932 100644 --- a/public/static/admin/listen.js +++ b/public/static/admin/listen.js @@ -48,7 +48,7 @@ define(['jquery', 'admin.plugs'], function () { var method = $(this).attr('data-one') ? 'one' : 'index'; var title = $(this).attr('data-title') || '文件管理'; var uptype = $(this).attr('data-uptype') || 'qiniu'; - var url = window.ROOT_URL + '/index.php/plugs/file/' + method + '.html?uptype=' + uptype + '&type=' + type + '&field=' + field; + var url = window.ROOT_URL + '/index.php/admin/plugs/upfile/' + method + '.html?uptype=' + uptype + '&type=' + type + '&field=' + field; $.form.iframe(url, title || '文件管理'); }).on('click', '[data-iframe]', function () { $.form.iframe($(this).attr('data-iframe'), $(this).attr('data-title') || '窗口'); diff --git a/public/static/admin/plugs.js b/public/static/admin/plugs.js index 99ae5954b..7de3dae03 100644 --- a/public/static/admin/plugs.js +++ b/public/static/admin/plugs.js @@ -669,24 +669,30 @@ define(['zeroclipboard', 'jquery'], function (ZeroClipboard) { } }); + (function ($) { + $.fn.serializeJson = function () { + var serializeObj = {}; + var array = this.serializeArray(); + $(array).each(function () { + if (serializeObj[this.name]) { + if ($.isArray(serializeObj[this.name])) { + serializeObj[this.name].push(this.value); + } else { + serializeObj[this.name] = [serializeObj[this.name], this.value]; + } + } else { + serializeObj[this.name] = this.value; + } + }); + return serializeObj; + }; + })(jQuery); + $(form).bind("submit", function (event) { var elements = $(this).find(self.inputTag); if (self.isAllpass(elements, params) && params.validate() && $.isFunction(callback)) { - var sdata = {}; - var data = $(form).serializeArray(); - for (var i in data) { - var key = data[i].name, value = data[i].value; - if (sdata.hasOwnProperty(key)) { - if (typeof sdata[key] === 'object') { - sdata[key].push(value); - } else { - sdata[key] = [sdata[key], value]; - } - } else { - sdata[key] = value; - } - } - callback.call(this, sdata); + var data = $(form).serialize(); + callback.call(this, data); } event.preventDefault(); return false; diff --git a/public/static/plugs/uploader/webuploader.css b/public/static/plugs/uploader/webuploader.css index 12f451f80..25982db9d 100644 --- a/public/static/plugs/uploader/webuploader.css +++ b/public/static/plugs/uploader/webuploader.css @@ -1,28 +1,28 @@ .webuploader-container { - position: relative; + position: relative; } .webuploader-element-invisible { - position: absolute !important; - clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ + position: absolute !important; + clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ clip: rect(1px,1px,1px,1px); } .webuploader-pick { - position: relative; - display: inline-block; - cursor: pointer; - background: #00b7ee; - padding: 10px 15px; - color: #fff; - text-align: center; - border-radius: 3px; - overflow: hidden; + position: relative; + display: inline-block; + cursor: pointer; + background: #00b7ee; + padding: 10px 15px; + color: #fff; + text-align: center; + border-radius: 3px; + overflow: hidden; } .webuploader-pick-hover { - background: #00a2d4; + background: #00a2d4; } .webuploader-pick-disable { - opacity: 0.6; - pointer-events:none; + opacity: 0.6; + pointer-events:none; }