Merge branches 'dev_aliyun' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/views/layouts/base_projects.html.erb

@@ -23,7 +23,7 @@
         <div class="newHeader" id="nHeader">
           <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
         <div class="cl"></div>
-        <div class="con_top pt60">
+        <div class="con_top">
             <div id="content" class="sy_contanier">
                 <%= render :partial => 'layouts/base_project_top' %>
             </div>

app/views/managements/video_applies/_video_apply_list.html.erb

@@ -22,6 +22,7 @@
               </li>
               <li class="clearfix mb10">
                 <span><%= video.title %></span>
+                <span style="margin-left: 20px;color: grey"><%= number_to_human_size(video.filesize) %></span>
               </li>
 
               <% if apply.pending? %>
@@ -58,20 +59,22 @@
 
 <script type="text/javascript">
     function video_authorization_gree(id){
+      if(window.confirm("确认同意该视频发布吗？")){
         $.ajax({
-            url: '/managements/video_applies/' + id + '/agree',
-            type: 'post',
-            success: function(data){
-              if (data && data.status != -1) {
-                $('#authentication_list .admin-con-box.apply-' + id).remove();
+          url: '/managements/video_applies/' + id + '/agree',
+          type: 'post',
+          success: function(data){
+            if (data && data.status != -1) {
+              $('#authentication_list .admin-con-box.apply-' + id).remove();
 
-                if($('#authentication_list .admin-con-box').length == 0){
-                  location.reload();
-                }
-              } else {
-                alert(data.message);
+              if($('#authentication_list .admin-con-box').length == 0){
+                location.reload();
               }
+            } else {
+              alert(data.message);
             }
+          }
         })
+      }
     }
 </script>