Преглед изворни кода

Some small fixes for the buttons in the board header (#580)

* UI: Fix title of button

The multi selection button should not get the filter description.

* UI: Add title for all buttons in the header bar

This is espectially important for the miniScreen view, because there
is only the icon and no text next to the button.
Alexander Sulfrian пре 9 година
родитељ
комит
0587158b6b
1 измењених фајлова са 8 додато и 7 уклоњено
  1. 8 7
      client/components/boards/boardHeader.jade

+ 8 - 7
client/components/boards/boardHeader.jade

@@ -41,23 +41,24 @@ template(name="boardHeaderBar")
               span
               span
                 = currentBoard.stars
                 = currentBoard.stars
 
 
-        a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}")
+        a.board-header-btn(
+          class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
+          title="{{_ currentBoard.permission}}")
           i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
           i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
           span {{_ currentBoard.permission}}
           span {{_ currentBoard.permission}}
 
 
-        a.board-header-btn.js-watch-board
+        a.board-header-btn.js-watch-board(
+          title="{{_ watchLevel }}")
           if $eq watchLevel "watching"
           if $eq watchLevel "watching"
             i.fa.fa-eye
             i.fa.fa-eye
-            span {{_ 'watching'}}
           if $eq watchLevel "tracking"
           if $eq watchLevel "tracking"
             i.fa.fa-bell
             i.fa.fa-bell
-            span {{_ 'tracking'}}
           if $eq watchLevel "muted"
           if $eq watchLevel "muted"
             i.fa.fa-bell-slash
             i.fa.fa-bell-slash
-            span {{_ 'muted'}}
+          span {{_ watchLevel}}
 
 
     a.board-header-btn.js-open-filter-view(
     a.board-header-btn.js-open-filter-view(
-        title="{{#if Filter.isActive}}{{_ 'filter-on-desc'}}{{/if}}"
+        title="{{#if Filter.isActive}}{{_ 'filter-on-desc'}}{{else}}{{_ 'filter'}}{{/if}}"
         class="{{#if Filter.isActive}}emphasis{{/if}}")
         class="{{#if Filter.isActive}}emphasis{{/if}}")
       i.fa.fa-filter
       i.fa.fa-filter
       span {{#if Filter.isActive}}{{_ 'filter-on'}}{{else}}{{_ 'filter'}}{{/if}}
       span {{#if Filter.isActive}}{{_ 'filter-on'}}{{else}}{{_ 'filter'}}{{/if}}
@@ -67,7 +68,7 @@ template(name="boardHeaderBar")
 
 
     if currentUser.isBoardMember
     if currentUser.isBoardMember
       a.board-header-btn.js-multiselection-activate(
       a.board-header-btn.js-multiselection-activate(
-          title="{{#if MultiSelection.isActive}}{{_ 'filter-on-desc'}}{{/if}}"
+          title="{{#if MultiSelection.isActive}}{{_ 'multi-selection-on'}}{{else}}{{_ 'multi-selection'}}{{/if}}"
           class="{{#if MultiSelection.isActive}}emphasis{{/if}}")
           class="{{#if MultiSelection.isActive}}emphasis{{/if}}")
         i.fa.fa-check-square-o
         i.fa.fa-check-square-o
         span {{#if MultiSelection.isActive}}{{_ 'multi-selection-on'}}{{else}}{{_ 'multi-selection'}}{{/if}}
         span {{#if MultiSelection.isActive}}{{_ 'multi-selection-on'}}{{else}}{{_ 'multi-selection'}}{{/if}}