',
+ //url
+ '
'
+ ].join('');
+ var dialog = self.createDialog({
+ name : name,
+ width : 450,
+ height : 230,
+ title : self.lang(name),
+ body : html,
+ yesBtn : {
+ name : self.lang('yes'),
+ click : function(e) {
+ var url = K.trim(urlBox.val()),
+ width = widthBox.val(),
+ height = heightBox.val();
+ if (url == 'http://' || K.invalidUrl(url)) {
+ alert(self.lang('invalidUrl'));
+ urlBox[0].focus();
+ return;
+ }
+ if (!/^\d*$/.test(width)) {
+ alert(self.lang('invalidWidth'));
+ widthBox[0].focus();
+ return;
+ }
+ if (!/^\d*$/.test(height)) {
+ alert(self.lang('invalidHeight'));
+ heightBox[0].focus();
+ return;
+ }
+ var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+ src : url,
+ type : K.mediaType(url),
+ width : width,
+ height : height,
+ autostart : autostartBox[0].checked ? 'true' : 'false',
+ loop : 'true'
+ });
+ self.insertHtml(html).hideDialog().focus();
+ }
+ }
+ }),
+ div = dialog.div,
+ urlBox = K('[name="url"]', div),
+ viewServerBtn = K('[name="viewServer"]', div),
+ widthBox = K('[name="width"]', div),
+ heightBox = K('[name="height"]', div),
+ autostartBox = K('[name="autostart"]', div);
+ urlBox.val('http://');
+
+ if (allowMediaUpload) {
+ var uploadbutton = K.uploadbutton({
+ button : K('.ke-upload-button', div)[0],
+ fieldName : filePostName,
+ extraParams : extraParams,
+ url : K.addParam(uploadJson, 'dir=media'),
+ afterUpload : function(data) {
+ dialog.hideLoading();
+ if (data.error === 0) {
+ var url = data.url;
+ if (formatUploadUrl) {
+ url = K.formatUrl(url, 'absolute');
+ }
+ urlBox.val(url);
+ if (self.afterUpload) {
+ self.afterUpload.call(self, url, data, name);
+ }
+ alert(self.lang('uploadSuccess'));
+ } else {
+ alert(data.message);
+ }
+ },
+ afterError : function(html) {
+ dialog.hideLoading();
+ self.errorDialog(html);
+ }
+ });
+ uploadbutton.fileBox.change(function(e) {
+ dialog.showLoading(self.lang('uploadLoading'));
+ uploadbutton.submit();
+ });
+ } else {
+ K('.ke-upload-button', div).hide();
+ }
+
+ if (allowFileManager) {
+ viewServerBtn.click(function(e) {
+ self.loadPlugin('filemanager', function() {
+ self.plugin.filemanagerDialog({
+ viewType : 'LIST',
+ dirName : 'media',
+ clickFn : function(url, title) {
+ if (self.dialogs.length > 1) {
+ K('[name="url"]', div).val(url);
+ if (self.afterSelectFile) {
+ self.afterSelectFile.call(self, url);
+ }
+ self.hideDialog();
+ }
+ }
+ });
+ });
+ });
+ } else {
+ viewServerBtn.hide();
+ }
+
+ var img = self.plugin.getSelectedMedia();
+ if (img) {
+ var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+ urlBox.val(attrs.src);
+ widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+ heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+ autostartBox[0].checked = (attrs.autostart === 'true');
+ }
+ urlBox[0].focus();
+ urlBox[0].select();
+ },
+ 'delete' : function() {
+ self.plugin.getSelectedMedia().remove();
+ // [IE] 删除图片后立即点击图片按钮出错
+ self.addBookmark();
+ }
+ };
+ self.clickToolbar(name, self.plugin.media.edit);
+});
From 3ef46fd8f5fa0708b0caac12a9986ff0d5c0e190 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 3 Jun 2015 13:54:49 +0800
Subject: [PATCH 07/31] 11
---
public/stylesheets/courses.css | 3 ---
1 file changed, 3 deletions(-)
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 1706098aa..457d6da75 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -502,9 +502,6 @@ blockquote {
}
a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;}
.min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}
-
-a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; }
-a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
.r_txt_tit{max-width:450px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
/*日历选择图*/
From 1c4ca0c9131485f3378007cfa9c2b1a0410e0f57 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 3 Jun 2015 14:33:53 +0800
Subject: [PATCH 08/31] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E8=BF=9B?=
=?UTF-8?q?=E5=85=A5=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE=E3=80=81?=
=?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=96=B0=E6=89=93=E5=BC=80?=
=?UTF-8?q?=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/_new_header.html.erb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb
index e4d2658b1..46a2eff63 100644
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@@ -18,15 +18,15 @@
<% if User.current.logged? -%>
',
+ '',
+ ' ',
+ ' ',
+ '',
+ '
',
+ //width
+ '',
+ '',
+ '',
+ '
',
+ //height
+ '',
+ '',
+ '',
+ '
',
+ //autostart
+ '',
+ '',
+ ' ',
+ '
',
+ '