富文本编辑框优化调整

donate-console/src/main/webapp/WEB-INF/views/index.html

@@ -139,35 +139,17 @@
 <toaster-container
         toaster-options="{'position-class': 'toast-top-center'}"></toaster-container>
 <script src="static/lib/jquery/jquery.min.js"></script>
-<script src="static/lib/bootstrap/js/bootstrap.min.js"></script>
+<!--<script src="static/lib/bootstrap/js/bootstrap.min.js"></script>-->
 <script src="static/lib/js/app.min.js"></script>
 <script type="text/javascript" src="static/lib/require.js"
         data-main="static/js/index/main.js"></script>
-<!--<script src="static/lib/text-angular/textAngular-rangy.min.js"></script>-->
-<!--<script src="static/lib/text-angular/textAngular.min.js"></script>-->
 <script type="text/javascript">
     $('#login').on('click', function () {
         $.get('sso/login', function(data) {
             data.content && (window.location.href = data.content);
         });
     });
-//    // 获取下拉菜单
-//    $(document).ready(function() {
-//        var btn = document.getElementsByClassName('dropdown-toggle')[0];
-//        console.log(btn);
-//        var sib = btn.nextElementSibling;
-//        var flag = true;
-//        console.log(btn.nextElementSibling);
-//        btn.onclick = function () {
-//            if (flag) {
-//                sib.style.display = 'none';
-//                flag = false
-//            } else {
-//                sib.style.display = 'block';
-//                flag = true
-//            }
-//        }
-//    });
+
 </script>
 </body>
 </html>

donate-console/src/main/webapp/resources/js/common/ui-form.js

@@ -2,8 +2,11 @@ define([ 'angular', 'jquery-summernote'], function(angular) {
 	'use strict';
 	angular.module('ui.form', []).controller('SummernoteController', ['$scope', '$attrs', function($scope, $attrs) {
 	    var currentElement, summernoteConfig = $scope.summernoteConfig || {};
-	    summernoteConfig.fontNames =['宋体', '黑体', '楷体', '隶书', '幼圆', '仿宋', 'Arial', 'Arial Black', 'Comic Sans MS', 'Courier New', 'Helvetica Neue', 'Impact', 'Lucida Grande', 'Tahoma', 'Times New Roman', 'Verdana'];
-	    summernoteConfig.defaultFontName = 'Tahoma';
+	    // summernoteConfig.fontNames =['宋体', '黑体', '楷体', '隶书', '幼圆', '仿宋', 'Arial', 'Arial Black', 'Comic Sans MS', 'Courier New', 'Helvetica Neue', 'Impact', 'Lucida Grande', 'Tahoma', 'Times New Roman', 'Verdana'];
+	    // summernoteConfig.defaultFontName = 'Tahoma';
+		// 暂时固定字体
+        summernoteConfig.fontNames = ['"Microsoft Yahei"'];
+		summernoteConfig.defaultFontName = '"Microsoft Yahei"';
 	    if (angular.isDefined($attrs.height)) { summernoteConfig.height = $attrs.height; }
 	    if (angular.isDefined($attrs.focus)) { summernoteConfig.focus = true; }
 	    if (angular.isDefined($attrs.lang)) {

donate-console/src/main/webapp/resources/view/activity/activity_launch.html

@@ -220,6 +220,11 @@
         width: 780px;
         height: 380px;
     }
+
+    .introduce .note-editable ol,.introduce .note-editable ul{
+        padding-left: 20px;
+    }
+
     .introduce .intro-header {
         /*position: relative;*/
         width: 100%;

donate-console/src/main/webapp/resources/view/project/project_launch_2.html

@@ -423,6 +423,11 @@
         font-size: 12px;
         color: #979797;
     }
+
+    .detail .list-item .simple .note-editable ol,.detail .list-item .simple .note-editable ul{
+        padding-left: 20px;
+    }
+
     .detail .list-item .introduce{
         width: 780px;
         border: 1px solid #dcdcdc;