Skip to content

Commit

Permalink
Merge pull request #3130 from hypothesis/sheetaluk/303-add-explanatio…
Browse files Browse the repository at this point in the history
…n-text-to-the-sharer-on-only-me-and-group-annotations

Add message to private and group annotations sharer.
  • Loading branch information
robertknight committed Mar 24, 2016
2 parents d8a8627 + 747f158 commit 28bb1ee
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
12 changes: 11 additions & 1 deletion h/static/styles/annotation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ $annotation-card-left-padding: 10px;
background: $white;
border: 1px solid $gray-lighter;
border-radius: 2px;
white-space: nowrap;
width: 200px;
font-size: $body1-font-size;
cursor: default;
Expand Down Expand Up @@ -224,6 +223,17 @@ $annotation-card-left-padding: 10px;
color: $text-color;
}

.share-dialog-msg {
color: $gray-light;
margin: -5px 10px 10px 10px;
line-height: 15px;
font-size: 11px;
}

.share-dialog-msg__audience {
font-style: italic;
}

.annotation-collapsed-replies {
display: none;
}
Expand Down
12 changes: 12 additions & 0 deletions h/templates/client/annotation.html
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,18 @@
class="share-dialog-target__icon h-icon-mail"></a>
</span>
<input class="share-dialog-link" type="text" value="{{vm.annotationURI}}" readonly>
<span class="share-dialog-msg" ng-if="vm.group() && !vm.group().public && !vm.isPrivate">
<span class="share-dialog-msg__audience">
Group.
</span>
Only group members will be able to view this annotation.
</span>
<span class="share-dialog-msg" ng-if="vm.isPrivate">
<span class="share-dialog-msg__audience">
Only me.
</span>
No one else will be able to view this annotation.
</span>
</span>
</span>
</div>
Expand Down

0 comments on commit 28bb1ee

Please sign in to comment.