Skip to content

C
coopwire-hypothesis
Commit 2ae0d7ec authored by Randall Leeds's avatar Randall Leeds
Browse files
Options

Merge pull request #2349 from hypothesis/thread-collapsing-redux 

Thread collapsing redux
parents 1077fc90 8f6bd339
Show whitespace changes
Inline Side-by-side
Showing with 240 additions and 293 deletions
h/static/scripts/directive/test/thread-test.coffee
View file @ 2ae0d7ec
...@@ -84,6 +84,9 @@ describe 'thread', -> ...@@ -84,6 +84,9 @@ describe 'thread', ->
after = controller.collapsed after = controller.collapsed
assert.equal(before, !after) assert.equal(before, !after)
it 'defaults to collapsed if it is a top level annotation', ->
assert.isTrue(controller.collapsed)
it 'can accept an argument to force a particular state', -> it 'can accept an argument to force a particular state', ->
controller.toggleCollapsed(true) controller.toggleCollapsed(true)
assert.isTrue(controller.collapsed) assert.isTrue(controller.collapsed)
...@@ -94,14 +97,12 @@ describe 'thread', -> ...@@ -94,14 +97,12 @@ describe 'thread', ->
controller.toggleCollapsed(false) controller.toggleCollapsed(false)
assert.isFalse(controller.collapsed) assert.isFalse(controller.collapsed)
it 'does not allow uncollapsing the thread if there are no replies', -> it 'allows collapsing the thread even if there are no replies', ->
count.withArgs('message').returns(1) count.withArgs('message').returns(1)
controller.toggleCollapsed() controller.toggleCollapsed()
assert.isTrue(controller.collapsed) assert.isFalse(controller.collapsed)
controller.toggleCollapsed() controller.toggleCollapsed()
assert.isTrue(controller.collapsed) assert.isTrue(controller.collapsed)
controller.toggleCollapsed(false)
assert.isTrue(controller.collapsed)
describe '#shouldShowAsReply', -> describe '#shouldShowAsReply', ->
count = null count = null
......
h/static/scripts/directive/thread.coffee
View file @ 2ae0d7ec
...@@ -33,11 +33,6 @@ ThreadController = [ ...@@ -33,11 +33,6 @@ ThreadController = [
!!value !!value
else else
not @collapsed not @collapsed
# We only allow uncollapsing of the thread if there are some replies to
# display.
if newval == false and this.numReplies() <= 0
return
@collapsed = newval @collapsed = newval
###* ###*
...@@ -199,6 +194,11 @@ module.exports = [ ...@@ -199,6 +194,11 @@ module.exports = [
ctrl.counter = counter ctrl.counter = counter
ctrl.filter = filter ctrl.filter = filter
# If annotation is a reply, it should be uncollapsed so that when
# shown, replies don't have to be individually expanded.
if ctrl.parent?
ctrl.collapsed = false
# Track the number of messages in the thread # Track the number of messages in the thread
if counter? if counter?
counter.count 'message', 1 counter.count 'message', 1
......
h/static/styles/annotations.scss
View file @ 2ae0d7ec
...@@ -18,7 +18,10 @@ ...@@ -18,7 +18,10 @@
} }
.annotation-timestamp { .annotation-timestamp {
line-height: 2; float: right;
font-size: .8em;
line-height: 1;
margin-top: (1 / (1 - .8)) * .1em; // scale up .1em offset to align baseline
color: $text-color; color: $text-color;
&:hover { color: $link-color-hover; } &:hover { color: $link-color-hover; }
&:focus { outline: 0; } &:focus { outline: 0; }
...@@ -162,3 +165,25 @@ privacy { ...@@ -162,3 +165,25 @@ privacy {
color: $text-color; color: $text-color;
} }
} }
.annotation-collapsed-replies {
display: none;
}
.thread-replies {
.annotation.collapsed {
margin-bottom: 0;
.annotation-header {
margin: 0;
}
.annotation-body, .annotation-footer {
display: none;
}
.annotation-collapsed-replies {
display: inline;
}
}
}
h/static/styles/threads.scss
View file @ 2ae0d7ec
$thread-padding: 1em; $thread-padding: 1em;
$threadexp-width: 1em;
.stream-list { .stream-list {
& > * { & > * {
...@@ -16,14 +15,11 @@ $threadexp-width: 1em; ...@@ -16,14 +15,11 @@ $threadexp-width: 1em;
} }
} }
.thread-replies { .thread-replies .thread:first-child {
.thread:first-child {
margin-top: 0.5em; margin-top: 0.5em;
}
} }
.thread { .thread {
@include pie-clearfix;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
...@@ -51,27 +47,18 @@ $threadexp-width: 1em; ...@@ -51,27 +47,18 @@ $threadexp-width: 1em;
} }
.threadexp { .threadexp {
background: $white;
color: $gray-light;
position: absolute; position: absolute;
left: -.7em;
width: 1.4em; width: 1.4em;
height: 1.4em; height: 1.4em;
top: 0; font-size: 1.1em;
left: -.7em;
span { span {
position: absolute; background: $white;
top: (1.4 - $threadexp-width) / 2; color: $gray-light;
left: (1.4 - $threadexp-width) / 2; display: block;
width: $threadexp-width; line-height: inherit;
height: $threadexp-width; text-align: center;
&:before {
font-size: $threadexp-width;
position: absolute;
top: 0;
left: 0;
}
} }
} }
} }
......
h/static/styles/vendor/fonts/selection.json
View file @ 2ae0d7ec
{ {
"IcoMoonType": "selection", "IcoMoonType": "selection",
"icons": [ "icons": [
{
"icon": {
"paths": [
"M426.667 725.333l213.333-213.333-213.333-213.333z"
],
"attrs": [],
"isMulticolor": false,
"tags": [
"arrow-right"
],
"grid": 24
},
"attrs": [],
"properties": {
"order": 65,
"id": 1305,
"prevSize": 24,
"code": 58909,
"name": "arrow-right"
},
"setIdx": 2,
"setId": 1,
"iconIdx": 0
},
{
"icon": {
"paths": [
"M298.667 426.667l213.333 213.333 213.333-213.333z"
],
"attrs": [],
"isMulticolor": false,
"tags": [
"arrow-drop-down"
],
"grid": 24
},
"attrs": [],
"properties": {
"order": 68,
"id": 1303,
"prevSize": 24,
"code": 58921,
"name": "arrow-drop-down"
},
"setIdx": 2,
"setId": 1,
"iconIdx": 2
},
{ {
"icon": { "icon": {
"paths": [ "paths": [
...@@ -21,9 +69,9 @@ ...@@ -21,9 +69,9 @@
"code": 58920, "code": 58920,
"name": "link" "name": "link"
}, },
"setIdx": 0, "setIdx": 2,
"setId": 6, "setId": 1,
"iconIdx": 271 "iconIdx": 3
}, },
{ {
"icon": { "icon": {
...@@ -46,8 +94,8 @@ ...@@ -46,8 +94,8 @@
"code": 58919 "code": 58919
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 0 "iconIdx": 4
}, },
{ {
"icon": { "icon": {
...@@ -70,8 +118,8 @@ ...@@ -70,8 +118,8 @@
"name": "delete" "name": "delete"
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 1 "iconIdx": 5
}, },
{ {
"icon": { "icon": {
...@@ -94,8 +142,8 @@ ...@@ -94,8 +142,8 @@
"name": "remove" "name": "remove"
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 2 "iconIdx": 6
}, },
{ {
"icon": { "icon": {
...@@ -118,8 +166,8 @@ ...@@ -118,8 +166,8 @@
"name": "edit" "name": "edit"
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 3 "iconIdx": 7
}, },
{ {
"icon": { "icon": {
...@@ -142,8 +190,8 @@ ...@@ -142,8 +190,8 @@
"code": 58880 "code": 58880
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 4 "iconIdx": 8
}, },
{ {
"icon": { "icon": {
...@@ -166,8 +214,8 @@ ...@@ -166,8 +214,8 @@
"code": 58881 "code": 58881
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 5 "iconIdx": 9
}, },
{ {
"icon": { "icon": {
...@@ -190,8 +238,8 @@ ...@@ -190,8 +238,8 @@
"code": 58882 "code": 58882
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 6 "iconIdx": 10
}, },
{ {
"icon": { "icon": {
...@@ -214,8 +262,8 @@ ...@@ -214,8 +262,8 @@
"code": 58883 "code": 58883
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 7 "iconIdx": 11
}, },
{ {
"icon": { "icon": {
...@@ -238,8 +286,8 @@ ...@@ -238,8 +286,8 @@
"code": 58884 "code": 58884
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 8 "iconIdx": 12
}, },
{ {
"icon": { "icon": {
...@@ -262,8 +310,8 @@ ...@@ -262,8 +310,8 @@
"code": 58885 "code": 58885
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 9 "iconIdx": 13
}, },
{ {
"icon": { "icon": {
...@@ -286,8 +334,8 @@ ...@@ -286,8 +334,8 @@
"code": 58886 "code": 58886
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 10 "iconIdx": 14
}, },
{ {
"icon": { "icon": {
...@@ -310,8 +358,8 @@ ...@@ -310,8 +358,8 @@
"code": 58888 "code": 58888
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 11 "iconIdx": 15
}, },
{ {
"icon": { "icon": {
...@@ -334,8 +382,8 @@ ...@@ -334,8 +382,8 @@
"code": 58889 "code": 58889
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 12 "iconIdx": 16
}, },
{ {
"icon": { "icon": {
...@@ -358,8 +406,8 @@ ...@@ -358,8 +406,8 @@
"code": 58890 "code": 58890
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 13 "iconIdx": 17
}, },
{ {
"icon": { "icon": {
...@@ -382,8 +430,8 @@ ...@@ -382,8 +430,8 @@
"code": 58892 "code": 58892
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 14 "iconIdx": 18
}, },
{ {
"icon": { "icon": {
...@@ -406,8 +454,8 @@ ...@@ -406,8 +454,8 @@
"code": 58893 "code": 58893
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 15 "iconIdx": 19
}, },
{ {
"icon": { "icon": {
...@@ -431,8 +479,8 @@ ...@@ -431,8 +479,8 @@
"code": 58894 "code": 58894
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 16 "iconIdx": 20
}, },
{ {
"icon": { "icon": {
...@@ -455,8 +503,8 @@ ...@@ -455,8 +503,8 @@
"code": 58895 "code": 58895
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 17 "iconIdx": 21
}, },
{ {
"icon": { "icon": {
...@@ -479,8 +527,8 @@ ...@@ -479,8 +527,8 @@
"code": 58896 "code": 58896
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 18 "iconIdx": 22
}, },
{ {
"icon": { "icon": {
...@@ -503,8 +551,8 @@ ...@@ -503,8 +551,8 @@
"code": 58897 "code": 58897
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 19 "iconIdx": 23
}, },
{ {
"icon": { "icon": {
...@@ -527,8 +575,8 @@ ...@@ -527,8 +575,8 @@
"code": 58898 "code": 58898
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 20 "iconIdx": 24
}, },
{ {
"icon": { "icon": {
...@@ -551,8 +599,8 @@ ...@@ -551,8 +599,8 @@
"code": 58899 "code": 58899
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 21 "iconIdx": 25
}, },
{ {
"icon": { "icon": {
...@@ -575,8 +623,8 @@ ...@@ -575,8 +623,8 @@
"code": 58900 "code": 58900
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 22 "iconIdx": 26
}, },
{ {
"icon": { "icon": {
...@@ -599,8 +647,8 @@ ...@@ -599,8 +647,8 @@
"name": "insert-comment" "name": "insert-comment"
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 23 "iconIdx": 27
}, },
{ {
"icon": { "icon": {
...@@ -623,8 +671,8 @@ ...@@ -623,8 +671,8 @@
"code": 58901 "code": 58901
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 24 "iconIdx": 28
}, },
{ {
"icon": { "icon": {
...@@ -647,32 +695,8 @@ ...@@ -647,32 +695,8 @@
"code": 58902 "code": 58902
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 25 "iconIdx": 29
},
{
"icon": {
"paths": [
"M298.667 426.667l213.333 213.333 213.333-213.333z"
],
"attrs": [],
"isMulticolor": false,
"tags": [
"arrow-drop-down"
],
"grid": 24
},
"attrs": [],
"properties": {
"id": 673,
"order": 43,
"prevSize": 24,
"name": "arrow-drop-down",
"code": 58905
},
"setIdx": 2,
"setId": 4,
"iconIdx": 26
}, },
{ {
"icon": { "icon": {
...@@ -695,8 +719,8 @@ ...@@ -695,8 +719,8 @@
"code": 58906 "code": 58906
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 27 "iconIdx": 31
}, },
{ {
"icon": { "icon": {
...@@ -719,8 +743,8 @@ ...@@ -719,8 +743,8 @@
"code": 58907 "code": 58907
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 28 "iconIdx": 32
}, },
{ {
"icon": { "icon": {
...@@ -743,8 +767,8 @@ ...@@ -743,8 +767,8 @@
"name": "chevron-left" "name": "chevron-left"
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 29 "iconIdx": 33
}, },
{ {
"icon": { "icon": {
...@@ -760,15 +784,15 @@ ...@@ -760,15 +784,15 @@
}, },
"attrs": [], "attrs": [],
"properties": { "properties": {
"order": 33, "order": 61,
"id": 750, "id": 750,
"prevSize": 24, "prevSize": 24,
"code": 58904, "code": 58904,
"name": "chevron-right" "name": "chevron-right"
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 30 "iconIdx": 34
}, },
{ {
"icon": { "icon": {
...@@ -791,56 +815,8 @@ ...@@ -791,56 +815,8 @@
"code": 58908 "code": 58908
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 31 "iconIdx": 35
},
{
"icon": {
"paths": [
"M512 341.333l-256 256 60.373 60.373 195.627-195.627 195.627 195.627 60.373-60.373z"
],
"attrs": [],
"isMulticolor": false,
"tags": [
"expand-less"
],
"grid": 24
},
"attrs": [],
"properties": {
"id": 682,
"order": 35,
"prevSize": 24,
"name": "expand-less",
"code": 58909
},
"setIdx": 2,
"setId": 4,
"iconIdx": 32
},
{
"icon": {
"paths": [
"M707.627 366.293l-195.627 195.627-195.627-195.627-60.373 60.373 256 256 256-256z"
],
"attrs": [],
"isMulticolor": false,
"tags": [
"expand-more"
],
"grid": 24
},
"attrs": [],
"properties": {
"id": 683,
"order": 36,
"name": "expand-more",
"prevSize": 24,
"code": 58910
},
"setIdx": 2,
"setId": 4,
"iconIdx": 33
}, },
{ {
"icon": { "icon": {
...@@ -863,8 +839,8 @@ ...@@ -863,8 +839,8 @@
"code": 58914 "code": 58914
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 34 "iconIdx": 38
}, },
{ {
"icon": { "icon": {
...@@ -887,8 +863,8 @@ ...@@ -887,8 +863,8 @@
"code": 58915 "code": 58915
}, },
"setIdx": 2, "setIdx": 2,
"setId": 4, "setId": 1,
"iconIdx": 35 "iconIdx": 39
}, },
{ {
"icon": { "icon": {
...@@ -914,9 +890,9 @@ ...@@ -914,9 +890,9 @@
"code": 58922, "code": 58922,
"name": "mail" "name": "mail"
}, },
"setIdx": 4, "setIdx": 2,
"setId": 2, "setId": 1,
"iconIdx": 0 "iconIdx": 40
}, },
{ {
"icon": { "icon": {
...@@ -942,9 +918,9 @@ ...@@ -942,9 +918,9 @@
"ligatures": "google-plus, brand2", "ligatures": "google-plus, brand2",
"name": "google-plus" "name": "google-plus"
}, },
"setIdx": 1, "setIdx": 2,
"setId": 5, "setId": 1,
"iconIdx": 392 "iconIdx": 41
}, },
{ {
"icon": { "icon": {
...@@ -970,9 +946,9 @@ ...@@ -970,9 +946,9 @@
"ligatures": "facebook2, brand7", "ligatures": "facebook2, brand7",
"name": "facebook" "name": "facebook"
}, },
"setIdx": 1, "setIdx": 2,
"setId": 5, "setId": 1,
"iconIdx": 397 "iconIdx": 42
}, },
{ {
"icon": { "icon": {
...@@ -999,9 +975,9 @@ ...@@ -999,9 +975,9 @@
"ligatures": "twitter, brand11", "ligatures": "twitter, brand11",
"name": "twitter" "name": "twitter"
}, },
"setIdx": 1, "setIdx": 2,
"setId": 5, "setId": 1,
"iconIdx": 401 "iconIdx": 43
}, },
{ {
"icon": { "icon": {
...@@ -1031,9 +1007,9 @@ ...@@ -1031,9 +1007,9 @@
"code": 58911, "code": 58911,
"name": "cc-by" "name": "cc-by"
}, },
"setIdx": 3, "setIdx": 2,
"setId": 3, "setId": 1,
"iconIdx": 0 "iconIdx": 44
}, },
{ {
"icon": { "icon": {
...@@ -1063,9 +1039,9 @@ ...@@ -1063,9 +1039,9 @@
"code": 58912, "code": 58912,
"name": "cc-logo" "name": "cc-logo"
}, },
"setIdx": 3, "setIdx": 2,
"setId": 3, "setId": 1,
"iconIdx": 1 "iconIdx": 45
}, },
{ {
"icon": { "icon": {
...@@ -1102,9 +1078,9 @@ ...@@ -1102,9 +1078,9 @@
"code": 58913, "code": 58913,
"name": "cc-zero" "name": "cc-zero"
}, },
"setIdx": 3, "setIdx": 2,
"setId": 3, "setId": 1,
"iconIdx": 2 "iconIdx": 46
}, },
{ {
"icon": { "icon": {
...@@ -1135,9 +1111,9 @@ ...@@ -1135,9 +1111,9 @@
"name": "markdown", "name": "markdown",
"code": 58891 "code": 58891
}, },
"setIdx": 3, "setIdx": 2,
"setId": 3, "setId": 1,
"iconIdx": 3 "iconIdx": 47
} }
], ],
"height": 1024, "height": 1024,
......
h/static/styles/vendor/icomoon.css
View file @ 2ae0d7ec
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
} }
@font-face { @font-face {
font-family: 'h'; font-family: 'h';
src: url(data:application/x-font-ttf;charset=utf-8;base64,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) format('truetype'); src: url(data:application/x-font-ttf;charset=utf-8;base64,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) format('truetype');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
...@@ -23,182 +23,135 @@ ...@@ -23,182 +23,135 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.h-icon-arrow-right:before {
content: "\e61d";
}
.h-icon-arrow-drop-down:before {
content: "\e629";
}
.h-icon-link:before { .h-icon-link:before {
content: "\e628"; content: "\e628";
} }
.h-icon-create:before { .h-icon-create:before {
content: "\e627"; content: "\e627";
} }
.h-icon-delete:before { .h-icon-delete:before {
content: "\e624"; content: "\e624";
} }
.h-icon-remove:before { .h-icon-remove:before {
content: "\e625"; content: "\e625";
} }
.h-icon-edit:before { .h-icon-edit:before {
content: "\e626"; content: "\e626";
} }
.h-icon-bookmark:before { .h-icon-bookmark:before {
content: "\e600"; content: "\e600";
} }
.h-icon-done:before { .h-icon-done:before {
content: "\e601"; content: "\e601";
} }
.h-icon-lock:before { .h-icon-lock:before {
content: "\e602"; content: "\e602";
} }
.h-icon-search:before { .h-icon-search:before {
content: "\e603"; content: "\e603";
} }
.h-icon-settings:before { .h-icon-settings:before {
content: "\e604"; content: "\e604";
} }
.h-icon-visibility:before { .h-icon-visibility:before {
content: "\e605"; content: "\e605";
} }
.h-icon-visibility-off:before { .h-icon-visibility-off:before {
content: "\e606"; content: "\e606";
} }
.h-icon-add:before { .h-icon-add:before {
content: "\e608"; content: "\e608";
} }
.h-icon-clear:before { .h-icon-clear:before {
content: "\e609"; content: "\e609";
} }
.h-icon-content-copy:before { .h-icon-content-copy:before {
content: "\e60a"; content: "\e60a";
} }
.h-icon-flag:before { .h-icon-flag:before {
content: "\e60c"; content: "\e60c";
} }
.h-icon-reply:before { .h-icon-reply:before {
content: "\e60d"; content: "\e60d";
} }
.h-icon-border-color:before { .h-icon-border-color:before {
content: "\e60e"; content: "\e60e";
} }
.h-icon-format-bold:before { .h-icon-format-bold:before {
content: "\e60f"; content: "\e60f";
} }
.h-icon-format-italic:before { .h-icon-format-italic:before {
content: "\e610"; content: "\e610";
} }
.h-icon-format-list-bulleted:before { .h-icon-format-list-bulleted:before {
content: "\e611"; content: "\e611";
} }
.h-icon-format-list-numbered:before { .h-icon-format-list-numbered:before {
content: "\e612"; content: "\e612";
} }
.h-icon-format-quote:before { .h-icon-format-quote:before {
content: "\e613"; content: "\e613";
} }
.h-icon-functions:before { .h-icon-functions:before {
content: "\e614"; content: "\e614";
} }
.h-icon-insert-comment:before { .h-icon-insert-comment:before {
content: "\e617"; content: "\e617";
} }
.h-icon-insert-link:before { .h-icon-insert-link:before {
content: "\e615"; content: "\e615";
} }
.h-icon-insert-photo:before { .h-icon-insert-photo:before {
content: "\e616"; content: "\e616";
} }
.h-icon-arrow-drop-down:before {
content: "\e619";
}
.h-icon-cancel:before { .h-icon-cancel:before {
content: "\e61a"; content: "\e61a";
} }
.h-icon-check:before { .h-icon-check:before {
content: "\e61b"; content: "\e61b";
} }
.h-icon-chevron-left:before { .h-icon-chevron-left:before {
content: "\e607"; content: "\e607";
} }
.h-icon-chevron-right:before { .h-icon-chevron-right:before {
content: "\e618"; content: "\e618";
} }
.h-icon-close:before { .h-icon-close:before {
content: "\e61c"; content: "\e61c";
} }
.h-icon-expand-less:before {
content: "\e61d";
}
.h-icon-expand-more:before {
content: "\e61e";
}
.h-icon-public:before { .h-icon-public:before {
content: "\e622"; content: "\e622";
} }
.h-icon-share:before { .h-icon-share:before {
content: "\e623"; content: "\e623";
} }
.h-icon-mail:before { .h-icon-mail:before {
content: "\e62a"; content: "\e62a";
} }
.h-icon-google-plus:before { .h-icon-google-plus:before {
content: "\ea88"; content: "\ea88";
} }
.h-icon-facebook:before { .h-icon-facebook:before {
content: "\ea8d"; content: "\ea8d";
} }
.h-icon-twitter:before { .h-icon-twitter:before {
content: "\ea91"; content: "\ea91";
} }
.h-icon-cc-by:before { .h-icon-cc-by:before {
content: "\e61f"; content: "\e61f";
} }
.h-icon-cc-logo:before { .h-icon-cc-logo:before {
content: "\e620"; content: "\e620";
} }
.h-icon-cc-zero:before { .h-icon-cc-zero:before {
content: "\e621"; content: "\e621";
} }
.h-icon-markdown:before { .h-icon-markdown:before {
content: "\e60b"; content: "\e60b";
} }
h/templates/client/annotation.html
View file @ 2ae0d7ec
...@@ -35,8 +35,17 @@ ...@@ -35,8 +35,17 @@
<!-- / Editing controls --> <!-- / Editing controls -->
</span> </span>
<span ng-if="!vm.annotation.user">Sign in to save this annotation.</span>
<span class="annotation-collapsed-replies">
<a class="reply-count small" href=""
ng-click="replyCountClick()"
ng-pluralize count="replyCount"
when="{'0': '', 'one': '1 reply', 'other': '{} replies'}"></a>
</span>
<!-- Timestamp --> <!-- Timestamp -->
<a class="annotation-timestamp small pull-right" <a class="annotation-timestamp"
target="_blank" target="_blank"
title="{{vm.annotation.updated | moment:'LLLL'}}" title="{{vm.annotation.updated | moment:'LLLL'}}"
ng-if="!vm.editing && vm.annotation.updated" ng-if="!vm.editing && vm.annotation.updated"
...@@ -76,7 +85,7 @@ ...@@ -76,7 +85,7 @@
<!-- / Body --> <!-- / Body -->
<!-- Tags --> <!-- Tags -->
<div class="annotation-section form-field" ng-if="vm.editing"> <div class="annotation-body form-field" ng-if="vm.editing">
<tags-input ng-model="vm.annotation.tags" <tags-input ng-model="vm.annotation.tags"
name="tags" name="tags"
class="tags" class="tags"
...@@ -100,16 +109,15 @@ ...@@ -100,16 +109,15 @@
</div> </div>
<!-- / Tags --> <!-- / Tags -->
<div class="annotation-section small" ng-if="vm.editing"> <footer class="annotation-footer">
<div class="small" ng-if="vm.editing">
<p ng-show="vm.privacyLevel.text == 'Only Me'"> <p ng-show="vm.privacyLevel.text == 'Only Me'">
<i class="h-icon-lock"></i> This annotation is viewable only to you.</p> <i class="h-icon-lock"></i> This annotation is viewable only to you.</p>
<p ng-show="vm.privacyLevel.text == 'Public'"> <p ng-show="vm.privacyLevel.text == 'Public'">
<i class="h-icon-public"></i> This annotation is viewable to everyone.</p> <i class="h-icon-public"></i> This annotation is viewable to everyone.</p>
</div> </div>
<div class="annotation-section form-actions" <div class="form-actions" ng-if="vm.editing" ng-switch="vm.action">
ng-if="vm.editing"
ng-switch="vm.action">
<div class="form-actions-buttons form-actions-left"> <div class="form-actions-buttons form-actions-left">
<button ng-switch-when="edit" <button ng-switch-when="edit"
ng-click="vm.save()" ng-click="vm.save()"
...@@ -124,28 +132,25 @@ ...@@ -124,28 +132,25 @@
ng-click="vm.revert()" ng-click="vm.revert()"
><i class="h-icon-cancel btn-icon"></i> Cancel</button> ><i class="h-icon-cancel btn-icon"></i> Cancel</button>
</div> </div>
</div> </div>
<div class="annotation-section annotation-license" ng-if="vm.editing"> <div class="annotation-section annotation-license" ng-if="vm.editing">
<a href="http://creativecommons.org/publicdomain/zero/1.0/" <a href="http://creativecommons.org/publicdomain/zero/1.0/"
title="View more information about the Creative Commons Public Domain license" title="View more information about the Creative Commons Public Domain license"
target="_blank"> target="_blank">
<i class="h-icon-cc-logo"></i><i class="h-icon-cc-zero"></i> <i class="h-icon-cc-logo"></i><i class="h-icon-cc-zero"></i>
Annotations can be freely reused by anyone for any purpose. Annotations can be freely reused by anyone for any purpose.
</a> </a>
</div> </div>
<footer class="annotation-footer"
ng-if="!vm.editing && vm.annotation.id">
<div class="annotation-replies"> <div class="annotation-replies" ng-if="replyCount > 0">
<a class="reply-count small" href="" <a class="reply-count small" href=""
ng-click="replyCountClick()" ng-click="replyCountClick()"
ng-pluralize count="replyCount" ng-pluralize count="replyCount"
when="{'0': '', 'one': '1 reply', 'other': '{} replies'}"></a> when="{'0': '', 'one': '1 reply', 'other': '{} replies'}"></a>
</div> </div>
<div class="annotation-actions"> <div class="annotation-actions" ng-if="!vm.editing && vm.annotation.id">
<button class="small btn-clean" <button class="small btn-clean"
ng-click="vm.reply()" ng-click="vm.reply()"
><i class="h-icon-reply btn-icon"></i> Reply</button> ><i class="h-icon-reply btn-icon"></i> Reply</button>
......
h/templates/client/thread.html
View file @ 2ae0d7ec
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
class="threadexp" class="threadexp"
title="{{vm.collapsed && 'Expand' || 'Collapse'}}" title="{{vm.collapsed && 'Expand' || 'Collapse'}}"
ng-click="vm.toggleCollapsed()"> ng-click="vm.toggleCollapsed()">
<span ng-class="{'h-icon-expand-more': !!vm.collapsed, <span ng-class="{'h-icon-arrow-right': !!vm.collapsed,
'h-icon-expand-less': !vm.collapsed}"></span> 'h-icon-arrow-drop-down': !vm.collapsed}"></span>
</a> </a>
<!-- Annotation --> <!-- Annotation -->
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<p><em>Message not available.</em></p> <p><em>Message not available.</em></p>
</div> </div>
<article class="annotation thread-message" <article class="annotation thread-message {{vm.collapsed && 'collapsed'}}"
name="annotation" name="annotation"
annotation="vm.container.message" annotation="vm.container.message"
annotation-embedded="{{isEmbedded}}" annotation-embedded="{{isEmbedded}}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment