diff --git a/README.md b/README.md index 08ca508..f21b9ab 100644 --- a/README.md +++ b/README.md @@ -270,7 +270,7 @@ PC端网址:www.hemingsheng.cn ,移动端网址:https://m.hemingsheng.cn │ editor-article.css │ ├─error - │ error.jsp + │ error.html │ ├─images │ │ favicon.ico diff --git a/WebContent/css/upload/editor-article.css b/WebContent/css/upload/editor-article.css index bd42043..efbda46 100644 --- a/WebContent/css/upload/editor-article.css +++ b/WebContent/css/upload/editor-article.css @@ -1,8 +1,7 @@ @charset "UTF-8"; -/************** 新版编辑文章 ***************/ .editor-form-div { - margin-top: 20px; + margin: 20px 15px; } .article-type { diff --git a/WebContent/js/editor/editor.js b/WebContent/js/editor/editor.js index 460d5f3..d28f9b6 100644 --- a/WebContent/js/editor/editor.js +++ b/WebContent/js/editor/editor.js @@ -6,13 +6,23 @@ * 2017年9月28日 */ +/** 加载插件 * */ +$.ajax({ + url : '/plugins/plugins.html', // 这里是静态页的地址 + async : false, + type : 'GET', // 静态页用get方法,否则服务器会抛出405错误 + success : function(data) { + $($('head')[0]).find('script:first').after(data); + } +}); + var article_id = -1;// 文章id,新文章默认为-1,编辑文章为相应的id var article_type = -1; //文章类型,默认-1,博客=blog,代码=code $(document).ready(function() { // 判断是否超级管理员,否则不能访问 /*if ($.cookie('username') != 'super_admin') { - window.location.replace('/module/error/error.jsp'); + window.location.replace('/module/error/error.html'); return; }*/ diff --git a/WebContent/js/login/formvalidator.js b/WebContent/js/login/formvalidator.js index 6d325d6..da62bde 100644 --- a/WebContent/js/login/formvalidator.js +++ b/WebContent/js/login/formvalidator.js @@ -86,13 +86,11 @@ function showLoginStatus() { * @returns */ function persCenterBtnClick() { - // window.open('/personal_center/mycenter.jsp'); - // 如果没有登录,跳转到错误页面 if (!$.cookie('username')) { - window.open('/module/error/error.jsp'); + window.open('/module/error/error.html'); } else { - window.open('/personal_center/mycenter.jsp'); + window.open('/usercenter.hms'); } } diff --git a/WebContent/js/personal_center/modify-email.js b/WebContent/js/personal_center/modify-email.js index d7afabe..502e29e 100644 --- a/WebContent/js/personal_center/modify-email.js +++ b/WebContent/js/personal_center/modify-email.js @@ -72,7 +72,7 @@ function nextStepClick(){ $('#mainWindow').html(''); $.ajax( { - url: 'modify_email1.html', //这里是静态页的地址 + url: '/personal_center/modify_email1.html', //这里是静态页的地址 async : false, type: 'GET', //静态页用get方法,否则服务器会抛出405错误 success: function(data){ diff --git a/WebContent/js/personal_center/personal-center.js b/WebContent/js/personal_center/personal-center.js index ea57adb..76ddaed 100644 --- a/WebContent/js/personal_center/personal-center.js +++ b/WebContent/js/personal_center/personal-center.js @@ -33,7 +33,7 @@ $(function() { // 如果没有登录 /* * if(!$.cookie('username')){ - * window.location.replace('/module/error/error.jsp'); } + * window.location.replace('/module/error/error.html'); } */ // 调整顶部导航的宽度 @@ -70,9 +70,6 @@ $(function() { $('#btn_modifyEmail').click(modifyEmail); $('#btn_uploadFile').click(uploadFile); $('#btn_showUsers').click(showUsers); - - // $('#privatemessage').click(); - // $('#aboutweb').click(); }); /** @@ -90,8 +87,8 @@ function loadAdminManageMenu() { + ' class="pull-right glyphicon glyphicon-chevron-down">' + '' + '