h/static/scripts/directive/newgroup_dialog.coffee

@@ -21,7 +21,6 @@ module.exports = ['$timeout', '$rootScope', 'localStorage', ($timeout, $rootScop
            $rootScope.socialview.selected = false
            for view in $rootScope.views
                if view.name == $rootScope.socialview.name
                    console.log view.name
                    view.selected = false
            $rootScope.views.push({name:scope.groupName, icon:'h-icon-group', selected:true})
            if localStorage.getItem 'group1.name'

h/static/scripts/directive/via-dialog.coffee

@@ -16,6 +16,7 @@ module.exports = ['$timeout', 'crossframe', 'via', '$rootScope', (
                $timeout (-> elem.find('#via').focus().select()), 0, false

        scope.shareGroup = false
        ## Make this a via link.
        scope.shareGroupLink = 'https://hypothes.is/g/102498/' + $rootScope.socialview.name
        scope.$watch (-> $rootScope.socialview.name), (socialview) ->
            if socialview != 'All'

h/static/scripts/widget-controller.coffee

@@ -97,14 +97,18 @@ module.exports = class WidgetController
      else if $rootScope.socialview.name != ('All' or 'Public' or 'Only Me')
        # Show group annotations.
        str2 = "group:" + $rootScope.socialview.name
        re2 = new RegExp(str2, "g");
        re2 = new RegExp(str2, "g")
        # if $scope.auth.user == null
        #   false
        # else
        #   re2.test(container?.message?.tags)
        re2.test(container?.message?.tags)
    
    $rootScope.views = [
        {name:'All', icon:'h-icon-public', selected:false}
        {name:'Public', icon:'h-icon-public', selected:true}
        {name:'Public', icon:'h-icon-public', selected:false}
        {name:'Only Me', icon:'h-icon-lock', selected:false}
        {name:'DEMOGROUP', icon:'h-icon-group', selected:false}
        {name:'DEMOGROUP', icon:'h-icon-group', selected:true}
    ]

    if localStorage.getItem 'group1.name'
@@ -120,4 +124,4 @@ module.exports = class WidgetController
      groupicon2 = localStorage.getItem 'group3.icon'
      $rootScope.views.push {name:groupname2, icon:groupicon2, selected:false}

    $rootScope.socialview = $rootScope.views[1]
    $rootScope.socialview = $rootScope.views[3]

h/static/styles/common.scss

@@ -114,14 +114,13 @@ html {

// Share this page /////////////////////
.share-via-link {
  font-size: 1.2em;
  top: 1px;
  left: 8px;
  position: relative;
  cursor: pointer;
  color: $gray-light;
  float: left;
  margin-right: 5px;
  margin-right: 8px;

  &:hover {
    color: $gray-dark;

h/templates/app.html

@@ -14,8 +14,8 @@
              class="dropdown-toggle"
              title="{% raw %}{{ auth.user|persona:'provider' }}{% endraw %}" 
              data-toggle="dropdown">
              <i class="h-icon-arrow-drop-down"></i>
              {% raw %}{{ auth.user|persona }}{% endraw %}
              <i class="h-icon-arrow-drop-down"></i>
        </span>
        <ul class="dropdown-menu pull-right" role="menu">
          <li ng-show="auth.user"><a href="" ng-click="accountDialog.visible='true'">Account</a></li>
@@ -34,7 +34,7 @@
      <span class="share-via-link">
        <i class="h-icon-share"
           title="Share this view"
           ng-click="viaLinkDialog.visible = true"></i>
           ng-click="viaLinkDialog.visible = !viaLinkDialog.visible"></i>
      </span>
      <!-- / Share this view -->

h/templates/client/annotation.html

@@ -8,11 +8,11 @@
       target="_blank"
       ng-href="{{vm.baseURI}}u/{{vm.annotation.user}}"
       >{{vm.annotation.user | persona}}</a>
    <i class="h-icon-lock" title="This annotation is visible only to you." ng-show="vm.isPrivate() && !vm.editing"></i>
    <i class="h-icon-public" title="Public annotation" ng-show="!vm.isPrivate() && !vm.editing && !groupAnno"></i>
    <i class="h-icon-group" title="{{groupAnno}}" ng-show="!vm.isPrivate() && !vm.editing && groupAnno"></i>
    <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&nbsp;<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"
          ng-show="vm.document.title">
@@ -35,12 +35,14 @@
  </span>

  <!-- Timestamp -->
  <a class="annotation-timestamp small pull-right"
     target="_blank"
     title="{{vm.annotation.updated | moment:'LLLL'}}"
     ng-if="!vm.editing && vm.annotation.updated"
     ng-href="{{vm.baseURI}}a/{{vm.annotation.id}}"
     >{{vm.timestamp}}</a>
  <span class="small pull-right">
    <a class="annotation-timestamp"
       target="_blank"
       title="{{vm.annotation.updated | moment:'LLLL'}}"
       ng-if="!vm.editing && vm.annotation.updated"
       ng-href="{{vm.baseURI}}a/{{vm.annotation.id}}"
       >{{vm.timestamp}}</a>
  </span>
</header>

<!-- Excerpts -->

h/templates/client/privacy.html

@@ -3,9 +3,9 @@
        role="button"
        class="dropdown-toggle"
        data-toggle="dropdown">
        <i class="h-icon-arrow-drop-down"></i>
        <i ng-class="level.icon"></i>
        {{level.text}}
        <i class="h-icon-arrow-drop-down"></i>
  </span>
  <ul class="dropdown-menu" role="menu">
    <li ng-repeat="level in levels" ng-click="setLevel(level)">

h/templates/client/viewcontrol.html

@@ -1,9 +1,9 @@
<i class="h-icon-arrow-drop-down" ng-show="auth.user"></i>
<span role="button"
      class="dropdown-toggle"
      data-toggle="dropdown">
      <i ng-class="socialview.icon"></i>
      {{socialview.name}}
      <i class="h-icon-arrow-drop-down" ng-show="auth.user"></i>
</span>
<ul class="dropdown-menu pull-right" role="menu" ng-show="auth.user">
  <li ng-repeat="view in views"

h/templates/help.html

@@ -28,35 +28,15 @@
      {% include "includes/header.html" %}
    </div> -->
    <article class="help-page-content">
      {% if is_help %}
        <section class="help-page-section">
          <h2 id="installation" class="help-page-heading">Installation</h2>
          <p class="help-page-lede">There are a couple of installations of Hypothesis to choose from:</p>
          <div class="numbered-list grid">
            <div class="column-desktop-1-2"><div class="numbered-list-item">If you want to annotate and comment on documents then install our browser extension.</div></div>
            <div class="column-desktop-1-2"><div class="numbered-list-item">If you wish to install Hypothesis on your own site then head over to GitHub.</div></div>
          </div>
        </section>
      {% endif %}
      {% if is_onboarding %}
        <section class="help-page-section">
          <h2 id="getting-started" class="help-page-heading">Getting started</h2>
          <p class="help-page-lede">Now you have the extension up and running. It's time to
            start annotating some documents.</p>
          <div class="numbered-list grid">
            <div class="column-desktop-1-2"><div class="numbered-list-item">Create an account using the sidebar on the right of the screen.</div></div>
            <div class="column-desktop-1-2"><div class="numbered-list-item">Go forth and annotate! Enable the sidebar via the button in the location bar.</div></div>
          </div>
        </section>
      {% endif %}
      {% if is_index %}
        <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 you clicked on a hypothes.is link and have been taken to this page.</p>
          <p>You are now seeeing and making annotations under the <strong>DEMOGROUP</strong> group.</p>
          <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>
          <p>You clicked on it and have been taken to this page.</p>
          <p>Please complete the following tasks.</p>
          <ol>
            <li>Create an account. Note: this isn't a real hypothes.is account, but you will still need to complete the confirm email step, which you can do <a href="http://dokku.hypothes.is:8025/">here</a>.</li>
            <li>Create an account. Note: this isn't a real hypothes.is account, but you will still need to complete the confirm email step, which you can do <strong><a href="http://dokku.hypothes.is:8025/">here</a></strong>.</li>
            <li>Select some text and choose the <i class="feature-icon h-icon-insert-comment"></i> icon.</li>
            <li>Write a short comment, save the note under the DEMOGROUP group.</li>
            <li>Find the share link for the DEMOGROUP group.</li>