Commit 10f26709db44823b9ed4acceed151cf03a29bd23
Exists in
master
and in
14 other branches
Merge branch 'btn-new-post'
* btn-new-post: Removed the vm.parentId ng-show condition # Conflicts: # src/app/article/content-viewer/navbar-actions.html
Showing
1 changed file
with
1 additions
and
2 deletions
Show diff stats
src/app/article/content-viewer/navbar-actions.html
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | <i class="fa fa-caret-down"></i> |
| 6 | 6 | </a> |
| 7 | 7 | <ul class="dropdown-menu" uib-dropdown-menu ng-show="vm.profile"> |
| 8 | - <li ng-show="vm.parentId"> | |
| 8 | + <li> | |
| 9 | 9 | <a href="#" ui-sref="main.cms({profile: vm.profile.identifier, parent_id: vm.parentId})"> |
| 10 | 10 | <i class="fa fa-file fa-fw fa-lg"></i> {{"navbar.content_viewer_actions.new_post" | translate}} |
| 11 | 11 | </a> |
| ... | ... | @@ -17,5 +17,4 @@ |
| 17 | 17 | </li> |
| 18 | 18 | </ul> |
| 19 | 19 | </li> |
| 20 | - | |
| 21 | 20 | </ul> | ... | ... |