diff --git a/app/views/home/_activity_tabsets.html.slim b/app/views/home/_activity_tabsets.html.slim index 52ab273cb..1b8084129 100644 --- a/app/views/home/_activity_tabsets.html.slim +++ b/app/views/home/_activity_tabsets.html.slim @@ -1,20 +1,21 @@ -tabset - - (collection = t 'feed_menu').each do |base, title| - tab heading= title active= (@filter == base) select= "actCtrl.changeActivityFilter('#{base}')" -/ The time line -.row.offset10 - .col-md-12.col-sm-12 - ul.timeline - / timeline time label - li.time-label ng-repeat-start= 'item in actCtrl.getCurActivity().feed' - span ng-show= "item.is_date_changed" - | {{item.date | amDateFormat:'ll'}} - / timeline item - li ng-include= "actCtrl.getTemplate(item)" - .hide ng-repeat-end= true - li - i.img-circle.bg-primary.fa.fa-clock-o -hr -btn.center-block.btn.btn-primary[ ng-show= 'actCtrl.getCurActivity().next_page_link' - ng-click= "actCtrl.load_more()" ] - = t('layout.activity_feed.load_messages') +div ng-hide= 'actCtrl.processing' + tabset + - (collection = t 'feed_menu').each do |base, title| + tab heading= title active= (@filter == base) select= "actCtrl.changeActivityFilter('#{base}')" + / The time line + .row.offset10 + .col-md-12.col-sm-12 + ul.timeline + / timeline time label + li.time-label ng-repeat-start= 'item in actCtrl.getCurActivity().feed' + span ng-show= "item.is_date_changed" + | {{item.date | amDateFormat:'ll'}} + / timeline item + li ng-include= "actCtrl.getTemplate(item)" + .hide ng-repeat-end= true + li + i.img-circle.bg-primary.fa.fa-clock-o + hr + btn.center-block.btn.btn-primary[ ng-show= 'actCtrl.getCurActivity().next_page_link' + ng-click= "actCtrl.load_more()" ] + = t('layout.activity_feed.load_messages') diff --git a/app/views/home/_filters.html.slim b/app/views/home/_filters.html.slim index 2b6b34521..5830cc3b8 100644 --- a/app/views/home/_filters.html.slim +++ b/app/views/home/_filters.html.slim @@ -1,7 +1,6 @@ hr h4 => t('layout.relations.filters') - strong.text-danger= t 'new_feature' .form-group = text_field_tag :owner_uname, nil, diff --git a/app/views/home/_own_activity_tab.html.slim b/app/views/home/_own_activity_tab.html.slim index 54d29b06f..970aa76d9 100644 --- a/app/views/home/_own_activity_tab.html.slim +++ b/app/views/home/_own_activity_tab.html.slim @@ -1,8 +1,6 @@ -tab[ active= "actCtrl.own_activity_tab.active" +tab[ heading= t('activity_menu.own_activity') + active= "actCtrl.own_activity_tab.active" select = "actCtrl.getContent('own_activity')" ] - tab-heading - => t('activity_menu.own_activity') - strong.text-danger= t 'new_feature' .row .col-md-3.offset10== render 'sidebar' .col-md-9.offset10