Merge branch 'uuhelper' into dev

jpress-web-admin/src/main/webapp/WEB-INF/admin/comment/uuHelperCommentList.html

@@ -14,7 +14,6 @@
     .bodyUas .messageContent{
         overflow: hidden;
         width: 300px;
-        border-bottom: 1px solid #d9d2de;
         padding-left: 30px;
     }
     .bodyUas .messageContent .leftImg{
@@ -75,6 +74,7 @@
     .box-content .box-message .table tbody.bodyUas tr td{
         vertical-align: middle;
         height: 70px;
+        border-bottom: 1px solid #eceaea;
     }
     .content-wrapper{
         background-color: #fff!important;
@@ -94,11 +94,11 @@
                 <table class="table table-striped" style="word-break:break-all">
                     <thead>
                     <tr>
-                        <th width="450" style="padding-left: 40px;">留言</th>
-                        <th width="330">文章标题</th>
-                        <th width="260">时间</th>
-                        <th width="230">是否显示</th>
-                        <th width="200">操作</th>
+                        <th width="200" style="padding-left: 40px;">留言</th>
+                        <th width="500">文章标题</th>
+                        <th width="200">时间</th>
+                        <th width="100">是否显示</th>
+                        <th width="120">操作</th>
                     </tr>
                     </thead>
                     <tbody class="bodyUas">

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_uuhelper.html

@@ -12,35 +12,44 @@
     <script src="${CPATH}/counter?cid=${content.id!}"></script>
     <title></title>
     <style>
+        body{
+            margin: 0;
+        }
         .main{
             width: 100%;
+            padding: 0;
             margin: 0 auto;
             background: #f9f9f9;
         }
         .main .container{
-            max-width: 640px;
+            /*max-width: 640px;*/
+            max-width: 100%;
             margin: 0 auto;
+            padding: 0 .333rem;
             text-align: center;
-            padding: 0 10px;
             background: #f9f9f9;
         }
+        .main .container .header{
+            margin-top: 1.6rem;
+        }
         .main .container .header p{
             text-align: left;
-            font-size: 18px;
-            color: #333;
+            font-size: 1.6rem;
+            color: #323232;
+            line-height: 2.4rem;
         }
         .main .container .header div{
-            margin: 5px 0;
+            margin: 1.3333rem 0 1.6rem 0;
             text-align: left;
-            font-size: 12px;
-            color: #999;
+            font-size: 1rem;
+            color: #969696;
         }
         .main .container .header div span:first-child{
-            margin-right: 10px;
+            margin-right: 1rem;
         }
         .main .container .section div,.main .container .section p{
-            font-size: 14px;
-            color: #000;
+            font-size: 1rem;
+            color: #323232;
             text-align: left;
         }
         .main .container .section div.img-container{
@@ -51,100 +60,103 @@
             max-width: 100%;
         }
         .main .container .section p{
-            font-size: 14px;
-            line-height: 25px;
-            color: #333;
-            text-indent: 2em;
+            font-size: 1rem;
+            line-height: 1.6rem;
+            color: #323232;
+            /*text-indent: 2em;*/
             text-align: left;
         }
         .main .container .section div.readCount{
-            margin: 30px 0;
+            margin: 3.33rem 0 2.33rem 0;
             overflow: hidden;
-            color: #8c8c8c;
+            color: #969696;
         }
         .main .container .section div.readCount div{
             float: left;
         }
         .main .container .section div.readCount div span{
-            font-size: 12px;
-            color: #999;
-            margin-right: 10px;
+            font-size: .933rem;
+            color: #969696;
+            margin-right: 0.33rem;
             cursor: pointer;
         }
         .main .container .section div.readCount div span em{
             color: #2f95dd;
-            margin-left: 5px;
+            margin-left: .166rem;
             font-style: normal;
-        }
-        .main .container .section div.readCount div span i{
-            display: inline-block;
-            font-size: 14px;
-            color: #8c8c8c;
+            font-size: .933rem;
         }
         .main .container .section div.readCount p{
             float: right;
-            font-size: 12px;
-            color: #999;
+            font-size: .933rem;
+            color: #969696;
         }
         .main .container .section div.readCount img{
-            width: 25px;
-            height: 22px;
+            width: 1.2rem;
+            height: 1.2rem;
+            margin-bottom: -2px;
         }
         .main .container .footer{
+            position: relative;
             border-top: 1px solid #d7d5d6;
-            padding: 20px;
+            padding: 0 .4333rem;
         }
         .main .container .footer .footer-header{
-            position: relative;
+            /*position: relative;*/
             cursor: pointer;
             width: 100%;
         }
         .main .container .footer .footer-header div.infoMessage{
             position: absolute;
-            left: 50%;
-            margin-left: -50%;
-            top: -30px;
-            width: 100%;
+            top: -0.733rem;
+            left: 40%;
             color: #8ca8bd;
-            font-size: 14px;
+            background: #faf9f9;
+            padding: 0 .333rem;
+            font-size: .933rem;
         }
         .main .container .footer .footer-header div.infoMessage:hover{
             color: #000;
         }
         .main .container .footer .footer-header div span{
-            margin-right: 5px;
-            font-size: 12px;
+            margin-right: .166rem;
+            font-size: .933rem;
             color: #82a6bf;
         }
         .main .container .footer .footer-header div img{
-            width: 15px;
-            height: 15px;
+            width: .9rem;
+            height: .9rem;
+            margin-bottom: -0.1rem;
+        }
+        .main .container .footer .footer-section{
+            width: 21.333rem;
         }
         .main .container .footer .footer-section .message{
-            margin: 30px 0;
+            width: 100%;
+            margin: 2.33rem 0 0 0;
             overflow: hidden ;
         }
         .main .container .footer .footer-section .message .left{
             float: left;
+            width: 2.66rem;
         }
         .main .container .footer .footer-section .message .right{
-            float: right;
-            width: 68%;
-            padding-bottom: 20px;
+            float: left;
+            width: 15.2rem;
+            margin-left: .666667rem;
             border-bottom: 1px solid #ddd;
         }
         .main .container .footer .footer-section .img{
             border: 1px solid #ddd;
-            border-radius: 5px;
-            width: 70px;
-            height: 7px;
-            font-size: 18px;
-            line-height: 70px;
+            width: 2.66rem;
+            height: 2.66rem;
+            font-size: 1rem;
+            line-height: 2.66rem;
             box-sizing: border-box;
         }
         .main .container .footer .footer-section .img img{
-            max-width: 70px;
-            max-height: 70px;
+            max-width: 2.66rem;
+            max-height: 2.66rem;
             text-align: center;
             margin: 0 auto;
         }
@@ -152,52 +164,53 @@
         }
         .main .container .footer .footer-section .detail .title{
             overflow: hidden;
-            margin-bottom: 22px;
+            margin-bottom: .866rem;
         }
         .main .container .footer .footer-section .detail .title img{
-            width: 25px;
-            height: 22px;
+            width: 1.2rem;
+            height: 1.2rem;
+            margin-bottom: -3px;
         }
         .main .container .footer .footer-section .detail .title span:first-child{
             float: left;
-            color: #333;
-            font-size: 12px;
+            color: #323232;
+            font-size: .9333rem;
         }
         .main .container .footer .footer-section .detail .title span:first-child em{
-            margin-left: 10px;
-            font-size: 12px;
-            color: #999;
+            margin-left: .333rem;
+            font-size: .8rem;
+            color: #969696;
             font-style: normal;
         }
         .main .container .footer .footer-section .detail .title span em{
-            font-size: 14px;
+            font-size: .8rem;
         }
         .main .container .footer .footer-section .detail .title span:last-child{
             color: #8c8c8c;
-            font-size: 14px;
+            font-size: .8rem;
             float: right;
             cursor: pointer;
         }
         .main .container .footer .footer-section .detail .title span:last-child em{
-            margin-left: 10px;
+            margin-left: .333rem;
             color: #2f95dd;
-            font-size: 12px;
-            padding-right: 5px;
+            font-size: .8rem;
             font-style: normal;
         }
         .main .container .footer .footer-section .detail p{
             text-align: left;
-            font-size: 12px;
+            font-size: .9333rem;
             color: #666;
-            margin-bottom: 22px;
+            line-height: 1.6rem;
+            margin-bottom: 1.6rem;
         }
         .main .container .footer .footer-section .detail .reply {
-            margin-top: 10px;
+            height: 1.1rem;
         }
         .main .container .footer .pull{
-            margin: 40px 0;
-            font-size: 12px;
-            color: #999;
+            margin: 1.5rem 0;
+            font-size: .933rem;
+            color: #b4b4b4;
         }
         .main .container .footer .loading{
            text-align: center;
@@ -209,57 +222,72 @@
             to {-webkit-transform:rotate(360deg);}
         }
         .main .container .footer .loading>img.loadingImg{
-            width: 30px;
-            height: 30px;
-            -webkit-mask-size: 30px 30px;
+            width: 1rem;
+            height: 1rem;
+            -webkit-mask-size: 1rem 1rem;
             -webkit-animation-name: rotate;
             -webkit-animation-duration: 1.5s;
             -webkit-animation-iteration-count: infinite;
             -webkit-animation-timing-function: linear;
         }
         .main .container .footer .footer-header .writeMessage{
+             margin-top: 2.333rem;
             display: none;
-            padding: 20px;
-            width: 80%;
+            width: 100%;
+            border: #ccc 1px solid;
+            height: 10rem;
         }
         .main .container .footer .footer-header .writeMessage textarea{
             width: 100%;
-            height: auto;
-            font-size: 12px;
+            height: 7.13333rem;
+            font-size: .933rem;
+            border: none;
+            float: left;
+            box-sizing: border-box;
+            padding: .5rem;
         }
         .main .container .footer .footer-header .writeMessage div{
-            text-align: right;
-            margin-top: 0;
             width: 100%;
+            margin: 0 auto;
+            position: relative;
+            height: 2.86rem;
+            float: left;
         }
         .main .container .footer .footer-header .writeMessage button{
-            margin-right: 15px;
+            position: relative;
+            float: left;
             display: inline-block;
-            width: 65px;
-            height: 25px;
-            line-height: 25px;
+            width: 50%;
+            height: 2.86rem;
+            line-height: 2.86rem;
             text-align: center;
-            font-size: 14px;
-            background: #b4b5b9;
-            border-radius: 5px;
-            color: #333;
+            font-size: 1.2rem;
+            background: #f0f0f0;
+            color: #b4b4b4;
             border: none;
             cursor: pointer;
         }
-        .main .container .footer .footer-header .writeMessage button:hover{
-            border: none;
-            background: #5078cb;
-            color: #fff;
+        .main .container .footer .footer-header .writeMessage button:first-child:after{
+            content: '';
+            position: absolute;
+            top: .8rem;
+            right: 0;
+            width: 1px;
+            height: 1.5rem;
+            background: #999;
+        }
+        .main .container .footer .footer-header .writeMessage button:last-child{
+            color: #2f95dd;
         }
 
         .toast-title {
             font-weight: bold;
-            font-size: 12px;
+            font-size: .4rem;
         }
         .toast-message {
             -ms-word-wrap: break-word;
             word-wrap: break-word;
-            font-size: 12px;
+            font-size: .4rem;
         }
     </style>
     <script>
@@ -324,7 +352,7 @@
                                     <p>${comment.text!}</p>
                                     <#if comment.qc_content ??>
                                         <div class="title reply">
-                                            <span>作者回复： <em>${(comment.qc_created?string("yyyy-MM-dd"))!}</em></span>
+                                            <span>作者回复<em>${(comment.qc_created?string("yyyy-MM-dd"))!}</em></span>
                                             <span><img class="votedUas${comment.qc_id} <#if comment.isvoted(comment.qc_id, userId!0, userid!0)>voted</#if>" src="${CPATH}/static/jpress/admin/image/hands.png" alt="" onclick="vote(${comment.qc_id})"/><em class="em${comment.qc_id}">${(comment.qc_vote_up)!'0'}</em></span>
                                         </div>
                                         <p>${comment.qc_content!}</p>
@@ -473,5 +501,8 @@
 
     }
 
+//    音频插件
+
+
 </script>
 </html>