Merge pull request #623 from unfoldingWord-dev/develop

.travis.yml

@@ -14,11 +14,12 @@ install:
 
 before_script:
   - npm install
-  - npm run build
 
 script:
   - tox -e py${TRAVIS_PYTHON_VERSION//[.]/}
+
 after_success:
   - coveralls
+
 services:
   - redis-server

requirements.txt

@@ -9,10 +9,12 @@ django-absoluteuri==1.1.0
 django-appconf==1.0.1
 django-bootstrap-form==3.2
 django-celery==3.1.17
+django-contrib-comments==1.7.1
 django-model-utils==2.4
 django-multiupload==0.5
 django-redis-cache==1.6.5
 django-reversion==1.10.0
+django-taggit==0.19.0
 django-user-accounts==1.3.1
 docutils==0.12
 pinax-eventlog==1.1.0

static/dist/css/site.css

@@ -12018,6 +12018,49 @@ label.required:after {
   top: 1rem;
   right: 1rem;
 }
+#id_honeypot,
+.comment-form-container .control-label {
+  display: none;
+}
+.comment-list-container {
+  margin-top: 5rem;
+}
+.comment-list-container ul {
+  list-style: none;
+  padding: 0;
+}
+.comment-list-container li {
+  margin-bottom: 2rem;
+}
+.comment-list-container .comment-list-header {
+  margin-bottom: 3rem;
+}
+.comment-list-container .comment-list-header h3 {
+  margin: 0;
+}
+.comment-list-container .comment-list-info {
+  color: #999;
+  font-size: 90%;
+}
+.btn.btn-icon {
+  background-color: transparent;
+  color: #AAA;
+  padding: 3px;
+}
+.btn.btn-icon:hover {
+  color: #666;
+}
+.comment-filter a {
+  border: 1px solid #AAA;
+  color: #AAA;
+  cursor: pointer;
+}
+.comment-filter .active a {
+  border-color: inherit;
+}
+.comment-filter .btn-xs {
+  padding: 0.5rem 1rem;
+}
 .full-width {
   width: 100%;
 }
@@ -12325,3 +12368,103 @@ label.required:after {
     -webkit-transform: scaleY(1);
   }
 }
+.event-detail .comment-form-container {
+  margin-top: 5rem;
+}
+.project-detail .section {
+  margin-top: 3rem;
+}
+.project-detail .section:first-of-type {
+  margin-top: 0;
+}
+.project-detail .section-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 1.5rem;
+}
+.project-detail .section-header-title {
+  flex: 0 0 auto;
+  color: #AAA;
+  padding: 3px;
+}
+.project-detail .section-header-line {
+  flex: 1 1 auto;
+  background-color: #DDD;
+  height: 1px;
+  margin-left: 1rem;
+  margin-right: 1rem;
+}
+.project-detail .section-header-actions {
+  flex: 0 0 auto;
+}
+.project-detail .custom-lists-container .comment-list-container {
+  margin: 0;
+  height: 320px;
+  border: 1px solid #DDD;
+  display: flex;
+  flex-direction: column;
+}
+.project-detail .custom-lists-container .comment-list-header {
+  padding: 1rem;
+  background-color: #FAFAFA;
+  flex: 0 0 auto;
+  margin: 0;
+}
+.project-detail .custom-lists-container .comment-list-header h3 {
+  font-size: 1.5rem;
+  margin: 0;
+}
+.project-detail .custom-lists-container .comment-list {
+  flex: 1 1 auto;
+  padding: 1rem;
+  overflow-y: auto;
+  margin-bottom: 0;
+}
+.project-detail .custom-lists-container .comment-filter {
+  position: absolute;
+  right: 20px;
+  top: 4px;
+}
+.project-detail .comment-form-container {
+  margin: 1rem 0 3rem;
+}
+.project-detail .events-comments-container .comment-list-container {
+  margin-top: 0;
+}
+.project-detail .events-comments-container .comment-list-header {
+  display: none;
+}
+.project-detail .events-comments-list {
+  padding: 0;
+  max-height: 500px;
+  overflow-y: auto;
+}
+.project-detail .events-comments-item {
+  display: flex;
+  padding: 1rem 0;
+  border-top: 1px dotted #DDD;
+}
+.project-detail .events-comments-item:first-of-type {
+  border-top: none;
+}
+.project-detail .events-comments-item .event-number {
+  flex: 0 0 10rem;
+}
+.project-detail .events-comments-item .event-number h4 {
+  margin-top: 0;
+}
+.project-detail .events-comments-item .event-number p {
+  font-size: 90%;
+  margin-bottom: 0;
+}
+.project-detail .events-comments-item .comment-list-container {
+  flex: 1 1 auto;
+  padding-left: 1rem;
+}
+.comment-list-container .fa.fa-trash {
+  cursor: pointer;
+  color: #999;
+}
+.comment-list-container .fa.fa-trash:hover {
+  color: #DA4F4A;
+}