Commit 3271062c authored by Randall Leeds's avatar Randall Leeds

Clean up use of footer and body sections

Make the tags section use .annotation-body (because tags are a form of
body) and put the form actions, reply count, and license messages into
the footer so that these collpasing properly and uniformly.
parent 5d9c801c
...@@ -178,7 +178,7 @@ privacy { ...@@ -178,7 +178,7 @@ privacy {
margin: 0; margin: 0;
} }
.annotation-body, .tags, .annotation-actions, .annotation-footer { .annotation-body, .annotation-footer {
display: none; display: none;
} }
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,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"
...@@ -107,16 +107,15 @@ ...@@ -107,16 +107,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()"
...@@ -131,28 +130,25 @@ ...@@ -131,28 +130,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>
......
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