Merge branch 'master' into profile_generalization

src/main/twirl/gitbucket/core/issues/list.scala.html

@@ -48,17 +48,32 @@ $(function(){
   });
 
   $('.table-issues input[type=checkbox]').change(function(){
-    if($('.table-issues input[type=checkbox]').filter(':checked').length == 0){
+    var all = $('.table-issues input[type=checkbox][value]');
+
+    // check all
+    if($(this).val() == 'on'){
+      var flag = $(this).is(":checked");
+      all.each(function(){
+        $(this).prop("checked", flag);
+      });
+    }
+
+    var count = all.filter(':checked').length;
+    // whether all check
+    $('.table-issues input[type=checkbox]').filter(':first').prop("checked", count > 0 && count == all.length);
+
+    if(count == 0){
       $('#table-issues-control').show();
       $('#table-issues-batchedit').hide();
     } else {
+      $('#batchedit-selected').text(count);
       $('#table-issues-control').hide();
       $('#table-issues-batchedit').show();
     }
   }).filter(':first').change();
 
   var submitBatchEdit = function(action, value) {
-    var checked = $('.table-issues input[type=checkbox]').filter(':checked').map(function(){ return this.value; }).get().join();
+    var checked = $('.table-issues input[type=checkbox][value]').filter(':checked').map(function(){ return this.value; }).get().join();
     var form = $('#batcheditForm');
     form.find('input[name=value]').val(value);
     form.find('input[name=checked]').val(checked);

src/main/twirl/gitbucket/core/issues/listparts.scala.html

@@ -26,8 +26,10 @@
 <table class="table table-bordered table-hover table-issues">
   <tr>
     <th style="background-color: #eee;">
+      @if(hasWritePermission){
         <input type="checkbox"/>
-      <span class="small">
+      }
+      <span class="small" id="table-issues-control">
         <a class="button-link@if(condition.state == "open"){ selected}" href="@condition.copy(state = "open").toURL">
           <img src="@assets/common/images/status-open@(if(condition.state == "open"){"-active"}).png"/>
           @openCount Open
@@ -36,8 +38,7 @@
           <img src="@assets/common/images/status-closed@(if(condition.state == "closed"){"-active"}).png"/>
           @closedCount Closed
         </a>
-      </span>
+        <div class="pull-right">
-      <div class="pull-right" id="table-issues-control">
           @helper.html.dropdown("Author", flat = true) {
             @collaborators.map { collaborator =>
               <li>
@@ -116,8 +117,11 @@
             </li>
           }
         </div>
+      </span>
       @if(hasWritePermission){
-        <div class="pull-right" id="table-issues-batchedit">
+        <span class="small" id="table-issues-batchedit">
+          <span id="batchedit-selected"></span> selected
+          <div class="pull-right">
             @helper.html.dropdown("Mark as", flat = true) {
               <li><a href="javascript:void(0);" class="toggle-state" data-id="open">Open</a></li>
               <li><a href="javascript:void(0);" class="toggle-state" data-id="close">Close</a></li>
@@ -139,13 +143,14 @@
                 <li><a href="javascript:void(0);" class="toggle-milestone" data-id="@milestone.milestoneId">@milestone.title</a></li>
               }
             }
-          @helper.html.dropdown("Assignee", flat = true) {
+            @helper.html.dropdown("Assign", flat = true) {
-            <li><a href="javascript:void(0);" class="toggle-assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
+              <li><a href="javascript:void(0);" class="toggle-assign" data-name="">Assign to nobody</a></li>
               @collaborators.map { collaborator =>
                 <li><a href="javascript:void(0);" class="toggle-assign" data-name="@collaborator"><i class="icon-white"></i>@avatar(collaborator, 20) @collaborator</a></li>
               }
             }
           </div>
+        </span>
       }
     </th>
   </tr>