Permalink
Comparing changes
Open a pull request
- 1 commit
- 5 files changed
- 0 commit comments
- 1 contributor
Unified
Split
Showing
with
16 additions
and 6 deletions.
- +7 −3 h/static/scripts/directive/via-dialog.coffee
- +6 −0 h/static/styles/common.scss
- +1 −1 h/templates/client/annotation.html
- +1 −1 h/templates/client/via_dialog.html
- +1 −1 h/templates/help.html
| @@ -16,12 +16,16 @@ module.exports = ['$timeout', 'crossframe', 'via', '$rootScope', ( | ||
| $timeout (-> elem.find('#via').focus().select()), 0, false | ||
| scope.shareGroup = false | ||
| scope.nameofgroup = $rootScope.socialview.name | ||
| ## Make this a via link. | ||
| scope.shareGroupLink = 'https://hypothes.is/g/102498/' + $rootScope.socialview.name | ||
| scope.shareGroupLink = via.url + '?groupid=34213&name=' + $rootScope.socialview.name + e? | ||
| scope.$watch (-> $rootScope.socialview.name), (socialview) -> | ||
| if socialview != 'All' | ||
| scope.nameofgroup = $rootScope.socialview.name | ||
| if socialview != 'All' and socialview != 'Public' and socialview != 'Only Me' | ||
| console.log socialview | ||
| scope.shareGroup = true | ||
| scope.shareGroupLink = 'https://hypothes.is/g/102498/' + $rootScope.socialview.name | ||
| scope.shareGroupLink = via.url + '?groupid=34213&name=' + $rootScope.socialview.name + e? | ||
| else | ||
| scope.shareGroup = false | ||
| @@ -186,6 +186,12 @@ html { | ||
| } | ||
| } | ||
| .privacy { | ||
| .dropdown-menu { | ||
| left: -50px !important; | ||
| } | ||
| } | ||
| .dropdown-menu { | ||
| background: $white; | ||
| border: solid 1px $gray-lighter; | ||
| @@ -11,7 +11,7 @@ | ||
| <i class="h-icon-border-color" ng-show="vm.isHighlight() && !vm.editing"></i> | ||
| <i class="h-icon-insert-comment" title="General comment" ng-show="vm.isComment()"></i> | ||
| <i class="h-icon-lock" title="This annotation is visible only to you." ng-show="vm.isPrivate() && !vm.editing"></i> | ||
| <span class="small" ng-show="!vm.isPrivate()">to <a ng-href="{{vm.baseURI}}/stream" target="_blank" class="annotation-timestamp" ng-show="!vm.isPrivate() && !vm.editing && groupAnno"><i class="h-icon-group" title="{{groupAnno}}"></i>{{groupAnno}}</a></span> | ||
| <span class="small" ng-show="!vm.isPrivate() && !vm.editing">to <a ng-href="{{vm.baseURI}}/stream" target="_blank" class="annotation-timestamp" ng-show="!vm.isPrivate() && !vm.editing && groupAnno"><i class="h-icon-group" title="{{groupAnno}}"></i>{{groupAnno}}</a></span> | ||
| <span class="small annotation-timestamp" ng-show="!vm.isPrivate() && !vm.editing && !groupAnno" style="margin-left:-3px"><i class="h-icon-public" title="Public annotation" ng-show="!vm.isPrivate() && !vm.editing && !groupAnno"></i> Public</span> | ||
| <span class="annotation-citation" | ||
| ng-if="!vm.embedded" | ||
| @@ -24,7 +24,7 @@ | ||
| title="Share via email" | ||
| class="h-icon-mail"></a> | ||
| </p> | ||
| <p style="margin-top: 1em;" ng-show="shareGroup">Share the link below to invite others to contribute annotations to this page:</p> | ||
| <p style="margin-top: 1em;" ng-show="shareGroup">Share the link below to invite others to contribute annotations to the <strong>{{nameofgroup}}</strong> group on this page:</p> | ||
| <p ng-show="shareGroup"><input id="via" class="form-input" type="text" ng-value="shareGroupLink" readonly></input></p> | ||
| <p ng-show="shareGroup" class="share-links"> | ||
| <a href="//twitter.com/intent/tweet?url={{shareGroupLink}}" | ||
| @@ -32,7 +32,7 @@ | ||
| <section class="help-page-section"> | ||
| <h2 id="getting-started" class="help-page-heading">Welcome to the Groups Prototype!</h2> | ||
| <p>For the sake of this demo let's pretend that someone you want to annotate with gave you the following Hypothesis group link: | ||
| <a href="#">https://hypothes.is/g/102498/DEMOGROUP</a></p> | ||
| <a href="#">https://via.hypothes.is/?groupid=34213&name=DEMOGROUP/https://groups2.dokku.hypothes.is/</a></p> | ||
| <p>You clicked on it and have been taken to this page.</p> | ||
| <p>Please complete the following tasks.</p> | ||
| <ol> | ||