Commit 39d682d7d31f6c76eecef5808bbea9f8b9a8d2ac

Authored by Jailson Dias
2 parents 85a9d2d8 5afc27b5

Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc
No preview for this file type
amadeus/static/css/a 0 → 100644
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
  1 +/*
  2 +Errno::ENOENT: No such file or directory @ rb_sysopen - a
  3 +
  4 +Backtrace:
  5 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `read'
  6 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `update_stylesheet'
  7 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets'
  8 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `each'
  9 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `update_stylesheets'
  10 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:294:in `watch'
  11 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin.rb:109:in `method_missing'
  12 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/exec/sass_scss.rb:360:in `watch_or_update'
  13 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/exec/sass_scss.rb:51:in `process_result'
  14 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/exec/base.rb:52:in `parse'
  15 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/exec/base.rb:19:in `parse!'
  16 +/var/lib/gems/2.3.0/gems/sass-3.4.23/bin/sass:13:in `<top (required)>'
  17 +/usr/local/bin/sass:23:in `load'
  18 +/usr/local/bin/sass:23:in `<main>'
  19 +*/
  20 +body:before {
  21 + white-space: pre;
  22 + font-family: monospace;
  23 + content: "Errno::ENOENT: No such file or directory @ rb_sysopen - a"; }
amadeus/static/css/base/amadeus.css
@@ -1344,8 +1344,8 @@ div.dataTables_wrapper div.dataTables_paginate { @@ -1344,8 +1344,8 @@ div.dataTables_wrapper div.dataTables_paginate {
1344 padding: 7px 15px; 1344 padding: 7px 15px;
1345 } 1345 }
1346 .participant .user-info .status, .modal_profile_sidebar .status { 1346 .participant .user-info .status, .modal_profile_sidebar .status {
1347 - width: 20px;  
1348 - height: 20px; 1347 + width: 12px;
  1348 + height: 12px;
1349 border-width: 1px; 1349 border-width: 1px;
1350 border-style: solid; 1350 border-style: solid;
1351 border-radius: 10px; 1351 border-radius: 10px;
@@ -1538,6 +1538,18 @@ div.dataTables_wrapper div.dataTables_paginate { @@ -1538,6 +1538,18 @@ div.dataTables_wrapper div.dataTables_paginate {
1538 display: none; 1538 display: none;
1539 } 1539 }
1540 1540
  1541 +.chat-panel {
  1542 + box-shadow: none;
  1543 +}
  1544 +
  1545 +.chat-panel .content {
  1546 + margin-top: 10px;
  1547 +}
  1548 +
  1549 +.chat-panel .chat-collapse {
  1550 + padding: 15px 0px;
  1551 +}
  1552 +
1541 @-moz-document url-prefix() { 1553 @-moz-document url-prefix() {
1542 .talk_body .checkbox input[type="checkbox"] { 1554 .talk_body .checkbox input[type="checkbox"] {
1543 display: none; 1555 display: none;
amadeus/static/css/themes/a 0 → 100644
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
  1 +/*
  2 +Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.
  3 + on line 35 of a
  4 +
  5 +30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'
  6 +31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'
  7 +32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'
  8 +33: *\/
  9 +34: body:before {
  10 +35: white-space: pre;
  11 +36: font-family: monospace;
  12 +37: content: "Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 39 of a\A \A 34: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 35: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 36: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 37: *\/\A 38: body:before {\A 39: white-space: pre;\A 40: font-family: monospace;\A 41: content: \\\\\\\\\\"Error: Invalid property: \\\\\\\\\\\"Backtrace:\\\\\\\\\\\" (no value).\A on line 4 of a\A \A 1: /*\A 2: Errno::ENOENT: No such file or directory @ rb_sysopen - a\A 3: \A 4: Backtrace:\A 5: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `read'\A 6: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `update_stylesheet'\A 7: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets'\A 8: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `each'\A 9: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `update_stylesheets'\\\\\\\\\\"; }\\\\\\\\\"; }\\\\\\\\"; }\\\\\\\"; }\\\\\\"; }\\\\\"; }\\\\"; }\\\"; }\\"; }\"; }"; }
  13 +
  14 +Backtrace:
  15 +a:35
  16 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:486:in `block in tabulate'
  17 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:444:in `each'
  18 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:444:in `each_with_index'
  19 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:444:in `tabulate'
  20 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:409:in `_to_tree'
  21 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:381:in `_render_with_sourcemap'
  22 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:298:in `render_with_sourcemap'
  23 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:492:in `update_stylesheet'
  24 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets'
  25 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `each'
  26 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `update_stylesheets'
  27 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:473:in `on_file_changed'
  28 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:331:in `block in watch'
  29 +/var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:252:in `on_change'
  30 +/var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'
  31 +/var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'
  32 +/var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'
  33 +*/
  34 +body:before {
  35 + white-space: pre;
  36 + font-family: monospace;
  37 + content: "Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of a\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 39 of a\A \A 34: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 35: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 36: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 37: */\A 38: body:before {\A 39: white-space: pre;\A 40: font-family: monospace;\A 41: content: \\\\\\\\\\\"Error: Invalid property: \\\\\\\\\\\\"Backtrace:\\\\\\\\\\\\" (no value).\A on line 4 of a\A \A 1: /*\A 2: Errno::ENOENT: No such file or directory @ rb_sysopen - a\A 3: \A 4: Backtrace:\A 5: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `read'\A 6: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `update_stylesheet'\A 7: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets'\A 8: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `each'\A 9: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `update_stylesheets'\\\\\\\\\\\"; }\\\\\\\\\\"; }\\\\\\\\\"; }\\\\\\\\"; }\\\\\\\"; }\\\\\\"; }\\\\\"; }\\\\"; }\\\"; }\\"; }\"; }"; }
amadeus/static/css/themes/green.css
@@ -514,6 +514,9 @@ a.add-row { @@ -514,6 +514,9 @@ a.add-row {
514 color: #FFFFFF; 514 color: #FFFFFF;
515 background-color: #59b75c; } 515 background-color: #59b75c; }
516 516
  517 +.chat-panel .chat-collapse {
  518 + background: #EEE; }
  519 +
517 @media(max-width: 768px) { 520 @media(max-width: 768px) {
518 .navbar .navbar-nav .dropdown .dropdown-menu li > a { 521 .navbar .navbar-nav .dropdown .dropdown-menu li > a {
519 color: #333333 !important; } 522 color: #333333 !important; }
amadeus/static/css/themes/green.css.map
1 { 1 {
2 "version": 3, 2 "version": 3,
3 -"mappings": "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", 3 +"mappings": "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",
4 "sources": ["green.sass"], 4 "sources": ["green.sass"],
5 "names": [], 5 "names": [],
6 "file": "green.css" 6 "file": "green.css"
amadeus/static/css/themes/green.sass
@@ -686,6 +686,9 @@ a.add-row @@ -686,6 +686,9 @@ a.add-row
686 color: $white 686 color: $white
687 background-color: #59b75c 687 background-color: #59b75c
688 688
  689 +.chat-panel .chat-collapse
  690 + background: #EEE
  691 +
689 @media(max-width: 768px) 692 @media(max-width: 768px)
690 .navbar .navbar-nav .dropdown .dropdown-menu li > a 693 .navbar .navbar-nav .dropdown .dropdown-menu li > a
691 color: #333333 !important 694 color: #333333 !important
amadeus/static/css/themes/themes 0 → 100644
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
  1 +/*
  2 +Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.
  3 + on line 35 of themes
  4 +
  5 +30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'
  6 +31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'
  7 +32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'
  8 +33: *\/
  9 +34: body:before {
  10 +35: white-space: pre;
  11 +36: font-family: monospace;
  12 +37: content: "Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: *\/\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 42 of themes\A \A 37: /var/lib/gems/2.3.0/gems/sass-3.4.23/bin/sass:13:in `<top (required)>'\A 38: /usr/local/bin/sass:23:in `load'\A 39: /usr/local/bin/sass:23:in `<main>'\A 40: *\/\A 41: body:before {\A 42: white-space: pre;\A 43: font-family: monospace;\A 44: content: \\\\\\\\\\\"Error: Invalid property: \\\\\\\\\\\\"Backtrace:\\\\\\\\\\\\" (no value).\A on line 4 of themes\A \A 1: /*\A 2: Errno::ENOENT: No such file or directory @ rb_sysopen - app\A 3: \A 4: Backtrace:\A 5: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `read'\A 6: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `update_stylesheet'\A 7: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets'\A 8: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `each'\A 9: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `update_stylesheets'\\\\\\\\\\\"; }\\\\\\\\\\"; }\\\\\\\\\"; }\\\\\\\\"; }\\\\\\\"; }\\\\\\"; }\\\\\"; }\\\\"; }\\\"; }\\"; }\"; }"; }
  13 +
  14 +Backtrace:
  15 +themes:35
  16 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:486:in `block in tabulate'
  17 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:444:in `each'
  18 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:444:in `each_with_index'
  19 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:444:in `tabulate'
  20 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:409:in `_to_tree'
  21 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:381:in `_render_with_sourcemap'
  22 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:298:in `render_with_sourcemap'
  23 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:492:in `update_stylesheet'
  24 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets'
  25 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `each'
  26 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `update_stylesheets'
  27 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:473:in `on_file_changed'
  28 +/var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:331:in `block in watch'
  29 +/var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:252:in `on_change'
  30 +/var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'
  31 +/var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'
  32 +/var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'
  33 +*/
  34 +body:before {
  35 + white-space: pre;
  36 + font-family: monospace;
  37 + content: "Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 35 of themes\A \A 30: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'\A 31: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapters/polling.rb:48:in `poll_changed_directories'\A 32: /var/lib/gems/2.3.0/gems/sass-3.4.23/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'\A 33: */\A 34: body:before {\A 35: white-space: pre;\A 36: font-family: monospace;\A 37: content: \\\\\\\\\\\"Error: Inconsistent indentation: 2 spaces were used for indentation, but the rest of the document was indented using 8 spaces.\A on line 42 of themes\A \A 37: /var/lib/gems/2.3.0/gems/sass-3.4.23/bin/sass:13:in `<top (required)>'\A 38: /usr/local/bin/sass:23:in `load'\A 39: /usr/local/bin/sass:23:in `<main>'\A 40: */\A 41: body:before {\A 42: white-space: pre;\A 43: font-family: monospace;\A 44: content: \\\\\\\\\\\\"Error: Invalid property: \\\\\\\\\\\\\"Backtrace:\\\\\\\\\\\\\" (no value).\A on line 4 of themes\A \A 1: /*\A 2: Errno::ENOENT: No such file or directory @ rb_sysopen - app\A 3: \A 4: Backtrace:\A 5: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `read'\A 6: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:484:in `update_stylesheet'\A 7: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets'\A 8: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `each'\A 9: /var/lib/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `update_stylesheets'\\\\\\\\\\\\"; }\\\\\\\\\\\"; }\\\\\\\\\\"; }\\\\\\\\\"; }\\\\\\\\"; }\\\\\\\"; }\\\\\\"; }\\\\\"; }\\\\"; }\\\"; }\\"; }\"; }"; }
amadeus/static/js/chat.js
1 var new_msgs = {}; 1 var new_msgs = {};
2 2
  3 +$('#chat-modal-info').on('show.bs.modal', function (e) {
  4 + var header = $(this).find('.talk_header');
  5 + if (header.length > 0) {
  6 + var li = $(".breadcrumb").find('li:last-child');
  7 + var li_text = $(li).html();
  8 + var new_li = $(li).clone();
  9 +
  10 + new_li.html(header.find('h4').data('breadcrumb'));
  11 +
  12 + $(li).html("<a href='#'>" + li_text + "</a>");
  13 + $(li).append("<span class='divider'>/</span>");
  14 +
  15 + new_li.appendTo('.breadcrumb');
  16 + }
  17 +});
  18 +
  19 +$('#chat-modal-info').on('hide.bs.modal', function (e) {
  20 + var header = $(this).find('.talk_header');
  21 + if (header.length > 0) {
  22 + $(".breadcrumb").find('li:last-child').remove();
  23 +
  24 + var li = $(".breadcrumb").find('li:last-child');
  25 + var text = $(li).find('a').text();
  26 +
  27 + $(li).html(text);
  28 + }
  29 +});
  30 +
  31 +
3 function getModalInfo(btn, space, space_type) { 32 function getModalInfo(btn, space, space_type) {
4 var url = btn.data('url'); 33 var url = btn.data('url');
5 34
@@ -115,6 +144,10 @@ function setChatFormSubmit() { @@ -115,6 +144,10 @@ function setChatFormSubmit() {
115 144
116 new_msgs[data.talk_id].push(data.new_id); 145 new_msgs[data.talk_id].push(data.new_id);
117 146
  147 + frm.attr('action', data.new_form_url);
  148 + $("#short-chat").attr('action', data.new_form_url);
  149 + $("#send-img").data('url', data.new_form_url);
  150 +
118 $('#chat-modal-form').modal('hide'); 151 $('#chat-modal-form').modal('hide');
119 }, 152 },
120 error: function(data) { 153 error: function(data) {
@@ -149,6 +182,7 @@ function setShortChatFormSubmit() { @@ -149,6 +182,7 @@ function setShortChatFormSubmit() {
149 dataType: "json", 182 dataType: "json",
150 async: false, 183 async: false,
151 success: function (data) { 184 success: function (data) {
  185 +
152 $('.messages-list').append(data.view); 186 $('.messages-list').append(data.view);
153 187
154 $(".messages-container").each(function () { 188 $(".messages-container").each(function () {
@@ -165,6 +199,9 @@ function setShortChatFormSubmit() { @@ -165,6 +199,9 @@ function setShortChatFormSubmit() {
165 199
166 editable.html(""); 200 editable.html("");
167 editable.trigger("focusout"); 201 editable.trigger("focusout");
  202 +
  203 + frm.attr('action', data.new_form_url);
  204 + $("#send-img").data('url', data.new_form_url);
168 }, 205 },
169 error: function(data) { 206 error: function(data) {
170 setShortChatFormSubmit(); 207 setShortChatFormSubmit();
@@ -227,7 +264,7 @@ function setFiltersSubmitAndPagination() { @@ -227,7 +264,7 @@ function setFiltersSubmitAndPagination() {
227 loading.hide(); 264 loading.hide();
228 265
229 if (data.count > 0) { 266 if (data.count > 0) {
230 - msg_section.append(data.messages); 267 + msg_section.html(data.messages);
231 268
232 messages.data('pages', data.num_pages); 269 messages.data('pages', data.num_pages);
233 messages.data('page', data.num_page); 270 messages.data('page', data.num_page);
@@ -306,4 +343,120 @@ function setFiltersSubmitAndPagination() { @@ -306,4 +343,120 @@ function setFiltersSubmitAndPagination() {
306 } 343 }
307 }); 344 });
308 }); 345 });
309 -}  
310 \ No newline at end of file 346 \ No newline at end of file
  347 +}
  348 +
  349 +function getParticipants(btn) {
  350 + var url = btn.attr('href'),
  351 + content_section = btn.parent().parent().parent().parent().find('.content');
  352 +
  353 + $.ajax({
  354 + url: url,
  355 + success: function (response) {
  356 + content_section.html(response);
  357 +
  358 + var items = $('#content-list').children(":visible").length;
  359 + var holder = content_section.find('.holder');
  360 +
  361 + if (items > 10) {
  362 + holder.jPages({
  363 + containerID : "content-list",
  364 + perPage: 10,
  365 + previous: "«",
  366 + next: "»",
  367 + midRange: 5
  368 + });
  369 + }
  370 + }
  371 + });
  372 +}
  373 +
  374 +function setSearchSubmit() {
  375 + var frm = $("#search-participants"),
  376 + content_section = frm.parent().parent().parent().parent().find('.content');
  377 +
  378 + frm.submit(function (e) {
  379 + e.preventDefault();
  380 + e.stopImmediatePropagation();
  381 +
  382 + $.ajax({
  383 + type: frm.attr('method'),
  384 + url: frm.attr('action'),
  385 + data: {'search': frm.find("input[name='search']").val()},
  386 + success: function (response) {
  387 +
  388 + content_section.html(response);
  389 +
  390 + var items = $('#content-list').children(":visible").length;
  391 + var holder = content_section.find('.holder');
  392 +
  393 + if (items > 10) {
  394 + holder.jPages({
  395 + containerID : "content-list",
  396 + perPage: 10,
  397 + previous: "«",
  398 + next: "»",
  399 + midRange: 5
  400 + });
  401 + }
  402 + },
  403 + error: function(data) {
  404 + setSearchSubmit();
  405 + },
  406 + });
  407 +
  408 + return false;
  409 + });
  410 +}
  411 +
  412 +$('.chat-collapse').on('shown.bs.collapse', function(e) {
  413 + if($(this).is(e.target)){
  414 + var li = $(".breadcrumb").find('li:last-child');
  415 + var li_text = $(li).html();
  416 + var url = $(".cat_url").val();
  417 + var new_li = $(li).clone();
  418 +
  419 + new_li.html($(this).parent().find('.panel-title span').text());
  420 +
  421 + $(li).html("<a href='" + url + "'>" + li_text + "</a>");
  422 + $(li).append("<span class='divider'>/</span>");
  423 +
  424 + new_li.appendTo('.breadcrumb');
  425 +
  426 + var content_section = $(this).find('.content');
  427 +
  428 + var url = $(this).data('url');
  429 +
  430 + setSearchSubmit();
  431 +
  432 + $.ajax({
  433 + url: url,
  434 + success: function (response) {
  435 + content_section.html(response);
  436 +
  437 + var items = $('#content-list').children(":visible").length;
  438 + var holder = content_section.find('.holder');
  439 +
  440 + if (items > 10) {
  441 + holder.jPages({
  442 + containerID : "content-list",
  443 + perPage: 10,
  444 + previous: "«",
  445 + next: "»",
  446 + midRange: 5
  447 + });
  448 + }
  449 + }
  450 + });
  451 + }
  452 +});
  453 +
  454 +$('.chat-collapse').on('hidden.bs.collapse', function(e) {
  455 + if($(this).is(e.target)){
  456 + $(".breadcrumb").find('li:last-child').remove();
  457 +
  458 + var li = $(".breadcrumb").find('li:last-child');
  459 + var text = $(li).find('a').text();
  460 +
  461 + $(li).html(text);
  462 + }
  463 +});
311 \ No newline at end of file 464 \ No newline at end of file
amadeus/urls.py
@@ -42,6 +42,7 @@ urlpatterns = [ @@ -42,6 +42,7 @@ urlpatterns = [
42 url(r'^pendencies/', include('notifications.urls', namespace = 'notifications')), 42 url(r'^pendencies/', include('notifications.urls', namespace = 'notifications')),
43 url(r'^links/', include('links.urls', namespace='links')), 43 url(r'^links/', include('links.urls', namespace='links')),
44 url(r'^pdf_files/', include('pdf_file.urls', namespace='pdf_files')), 44 url(r'^pdf_files/', include('pdf_file.urls', namespace='pdf_files')),
  45 + url(r'^webconferences/', include('webconference.urls', namespace = 'webconferences')),
45 url(r'^i18n/', include('django.conf.urls.i18n')), 46 url(r'^i18n/', include('django.conf.urls.i18n')),
46 #API 47 #API
47 url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')), 48 url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
@@ -49,8 +50,6 @@ urlpatterns = [ @@ -49,8 +50,6 @@ urlpatterns = [
49 url(r'^s3direct/', include('s3direct.urls')), 50 url(r'^s3direct/', include('s3direct.urls')),
50 url(r'^summernote/', include('django_summernote.urls')), 51 url(r'^summernote/', include('django_summernote.urls')),
51 url(r'session_security/', include('session_security.urls')), 52 url(r'session_security/', include('session_security.urls')),
52 - url(r'^webconferences/', include('webconference.urls', namespace = 'webconferences')),  
53 -  
54 ] 53 ]
55 54
56 if settings.DEBUG: 55 if settings.DEBUG:
chat/templates/chat/_participants.html 0 → 100644
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
  1 +{% load static i18n chat_tags %}
  2 +
  3 +{% if participants.count > 0 %}
  4 + <div class="panel category-panel-content panel-body">
  5 + <h2 class="my-subjects-title"><b>{% trans 'Participants' %}</b></h2>
  6 +
  7 + <div id="content-list" class="participants-group">
  8 + {% for participant in participants %}
  9 + {% include 'chat/_view_participant.html' with space=space space_type=space_type %}
  10 + {% endfor %}
  11 + </div>
  12 + <div class="col-md-12">
  13 + <div class="text-center">
  14 + <div class="holder"></div>
  15 + </div>
  16 + </div>
  17 + </div>
  18 +{% else %}
  19 + <div class="text-center no-subjects">
  20 + <i class="fa fa-envelope-o"></i>
  21 + <h4>{% trans 'There is no other participants in this space yet.' %}</h4>
  22 + </div>
  23 +{% endif %}
0 \ No newline at end of file 24 \ No newline at end of file
chat/templates/chat/_talks_list.html 0 → 100644
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
  1 +{% load static i18n chat_tags %}
  2 +
  3 +{% if conversations.count > 0 %}
  4 + <div class="panel category-panel-content panel-body">
  5 + <h2 class="my-subjects-title"><b>{% trans 'Conversations' %}</b></h2>
  6 +
  7 + <div id="content-list" class="talks-group">
  8 + {% for chat in conversations %}
  9 + {% include 'chat/_view.html' with space=space space_type=space_type %}
  10 + {% endfor %}
  11 + </div>
  12 + <div class="col-md-12">
  13 + <div class="text-center">
  14 + <div class="holder"></div>
  15 + </div>
  16 + </div>
  17 + </div>
  18 +{% else %}
  19 + <div class="text-center no-subjects">
  20 + <i class="fa fa-envelope-o"></i>
  21 + <h4>{% trans 'You do not posses messages in this space yet.' %}</h4>
  22 + </div>
  23 +{% endif %}
0 \ No newline at end of file 24 \ No newline at end of file
chat/templates/chat/list.html
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div id="core-subjects-options-div"> 15 <div id="core-subjects-options-div">
16 <ul class="core-subjects-options chat-tabs"> 16 <ul class="core-subjects-options chat-tabs">
17 <a href="{% url 'chat:manage_general' %}"><li data-chat="general" class="active">{% trans "General" %} (<span>{{ totals.general }}</span>)</li></a> 17 <a href="{% url 'chat:manage_general' %}"><li data-chat="general" class="active">{% trans "General" %} (<span>{{ totals.general }}</span>)</li></a>
18 - <a href=""><li data-chat="category">{% trans "Per Category" %} (<span>{{ totals.category }}</span>)</li></a> 18 + <a href="{% url 'chat:manage_category' %}"><li data-chat="category">{% trans "Per Category" %} (<span>{{ totals.category }}</span>)</li></a>
19 <a href=""><li data-chat="subject">{% trans "Per Subject" %} (<span>{{ totals.subject }}</span>)</li></a> 19 <a href=""><li data-chat="subject">{% trans "Per Subject" %} (<span>{{ totals.subject }}</span>)</li></a>
20 </ul> 20 </ul>
21 </div> 21 </div>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 </div> 46 </div>
47 47
48 {% if conversations.count > 0 %} 48 {% if conversations.count > 0 %}
49 - <div class="panel panel-info panel-body"> 49 + <div class="panel category-panel-content panel-body">
50 <h2 class="my-subjects-title"><b>{% trans 'Conversations' %}</b></h2> 50 <h2 class="my-subjects-title"><b>{% trans 'Conversations' %}</b></h2>
51 51
52 <div class="talks-group"> 52 <div class="talks-group">
@@ -70,4 +70,4 @@ @@ -70,4 +70,4 @@
70 <div class="modal fade" id="chat-modal-form" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"></div> 70 <div class="modal fade" id="chat-modal-form" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"></div>
71 71
72 <script type="text/javascript" src="{% static 'js/chat.js' %}"></script> 72 <script type="text/javascript" src="{% static 'js/chat.js' %}"></script>
73 - {% endblock %}  
74 \ No newline at end of file 73 \ No newline at end of file
  74 +{% endblock %}
75 \ No newline at end of file 75 \ No newline at end of file
chat/templates/chat/list_category.html 0 → 100644
@@ -0,0 +1,110 @@ @@ -0,0 +1,110 @@
  1 +{% extends 'base.html' %}
  2 +
  3 +{% load static i18n pagination permissions_tags %}
  4 +{% load django_bootstrap_breadcrumbs %}
  5 +
  6 +{% block breadcrumbs %}
  7 + {{ block.super }}
  8 +
  9 + {% trans 'Messages per Category' as category %}
  10 +
  11 + {% breadcrumb category 'chat:manage_category' %}
  12 +{% endblock %}
  13 +
  14 +{% block content %}
  15 + <input type="hidden" value="{% url 'chat:manage_category' %}" class="cat_url">
  16 +
  17 + <div id="core-subjects-options-div">
  18 + <ul class="core-subjects-options chat-tabs">
  19 + <a href="{% url 'chat:manage_general' %}"><li data-chat="general">{% trans "General" %} (<span>{{ totals.general }}</span>)</li></a>
  20 + <a href="{% url 'chat:manage_category' %}"><li data-chat="category" class="active">{% trans "Per Category" %} (<span>{{ totals.category }}</span>)</li></a>
  21 + <a href=""><li data-chat="subject">{% trans "Per Subject" %} (<span>{{ totals.subject }}</span>)</li></a>
  22 + </ul>
  23 + </div>
  24 +
  25 + <div class="col-md-12 cards-content">
  26 + {% if categories.count > 0 %}
  27 + <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
  28 + {% for category in categories %}
  29 + {% category_permissions request.user category as has_category_permissions %}
  30 +
  31 + {% if category.visible or has_category_permissions %}
  32 + {% if category.visible %}
  33 + <div class="panel panel-info category-panel chat-panel">
  34 + <div class="panel-heading">
  35 + {% elif has_category_permissions %}
  36 + <div class="panel special-panel">
  37 + <div class="panel-heading panel-invisible chat-panel">
  38 + {% endif %}
  39 +
  40 + <div class="row">
  41 + <div class="col-md-12 category-header">
  42 + <h4 class="panel-title">
  43 + <a class="category-course-link pull-left" data-parent="#accordion" data-toggle="collapse" href="#{{category.slug}}">
  44 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> <span>{{ category.name }}</span>
  45 +
  46 + </a>
  47 + </h4>
  48 +
  49 + <div class="col-md-5 pull-right category-card-items">
  50 + {% if has_category_permissions %}
  51 + <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  52 + <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
  53 + </a>
  54 + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
  55 + {% if request.user.is_staff %}
  56 + <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> {% trans 'Replicate' %}</a></li>
  57 + {% endif %}
  58 + <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans 'Edit' %}</a></li>
  59 + <li>
  60 + <a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')" aria-hidden="true"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
  61 + </ul>
  62 + {% endif %}
  63 + </div>
  64 + </div>
  65 + </div>
  66 + </div>
  67 + <div id="{{category.slug}}" class="panel-collapse panel-body collapse chat-collapse" data-url="{% url 'chat:category_talks' category.id %}">
  68 + <div class="panel panel-default">
  69 + <div class="panel-body">
  70 + <div class="col-md-8">
  71 + <form id="search-participants" action="{% url 'chat:participants_category' category.id %}" method="GET" class="form-horizontal">
  72 + <div class="form-group">
  73 + <div class="col-md-11 col-sm-11 col-xs-11">
  74 + <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
  75 + </div>
  76 + <div class="col-md-1 col-sm-1 col-xs-1">
  77 + <button type="submit" class="btn btn-fab btn-fab-mini">
  78 + <i class="fa fa-search"></i>
  79 + </button>
  80 + </div>
  81 + </div>
  82 + </form>
  83 + </div>
  84 + <div class="col-md-4">
  85 + <a href="{% url 'chat:participants_category' category.id %}" onclick="getParticipants($(this)); return false;" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a>
  86 + </div>
  87 + </div>
  88 + </div>
  89 +
  90 + <div class="content">
  91 + </div>
  92 + </div>
  93 + </div>
  94 + {% endif %}
  95 + {% endfor %}
  96 +
  97 + {% pagination request paginator page_obj %}
  98 + </div>
  99 + {% endif %}
  100 + </div>
  101 +
  102 + <div id="modal_course"></div>
  103 +
  104 + <div class="modal fade" id="chat-modal-info" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"></div>
  105 +
  106 + <div class="modal fade" id="chat-modal-form" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"></div>
  107 +
  108 + <script type="text/javascript" src="{% static 'js/category.js' %}"></script>
  109 + <script type="text/javascript" src="{% static 'js/chat.js' %}"></script>
  110 +{% endblock %}
0 \ No newline at end of file 111 \ No newline at end of file
chat/templates/chat/list_participants.html
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <div id="core-subjects-options-div"> 17 <div id="core-subjects-options-div">
18 <ul class="core-subjects-options mural-tabs"> 18 <ul class="core-subjects-options mural-tabs">
19 <a href="{% url 'chat:manage_general' %}"><li data-chat="general" class="active">{% trans "General" %} (<span>{{ totals.general }}</span>)</li></a> 19 <a href="{% url 'chat:manage_general' %}"><li data-chat="general" class="active">{% trans "General" %} (<span>{{ totals.general }}</span>)</li></a>
20 - <a href=""><li data-chat="categories">{% trans "Per Category" %} (<span>{{ totals.category }}</span>)</li></a> 20 + <a href="{% url 'chat:manage_category' %}"><li data-chat="categories">{% trans "Per Category" %} (<span>{{ totals.category }}</span>)</li></a>
21 <a href=""><li data-chat="subjects">{% trans "Per Subject" %} (<span>{{ totals.subject }}</span>)</li></a> 21 <a href=""><li data-chat="subjects">{% trans "Per Subject" %} (<span>{{ totals.subject }}</span>)</li></a>
22 </ul> 22 </ul>
23 </div> 23 </div>
chat/templates/chat/talk.html
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <span class="pull-left"> 10 <span class="pull-left">
11 <img src="{{ participant.image_url }}" /> 11 <img src="{{ participant.image_url }}" />
12 </span> 12 </span>
13 - <h4 class=" pull-left"> 13 + <h4 class="pull-left" data-breadcrumb="{% trans 'Talk with ' %}{{ participant }}">
14 <a class="status {{ status }}" title="{{ status|status_text }}"></a> 14 <a class="status {{ status }}" title="{{ status|status_text }}"></a>
15 <b>{{ participant }}</b> 15 <b>{{ participant }}</b>
16 </h4> 16 </h4>
chat/templatetags/chat_tags.py
@@ -53,7 +53,7 @@ def last_message(chat): @@ -53,7 +53,7 @@ def last_message(chat):
53 53
54 @register.filter(name = 'notifies') 54 @register.filter(name = 'notifies')
55 def notifies(chat, user): 55 def notifies(chat, user):
56 - total = ChatVisualizations.objects.filter(message__talk = chat, user = user).count() 56 + total = ChatVisualizations.objects.filter(message__talk = chat, user = user, viewed = False).count()
57 57
58 return total 58 return total
59 59
@@ -4,7 +4,10 @@ from . import views @@ -4,7 +4,10 @@ from . import views
4 urlpatterns = [ 4 urlpatterns = [
5 url(r'^$', views.GeneralIndex.as_view(), name='manage_general'), 5 url(r'^$', views.GeneralIndex.as_view(), name='manage_general'),
6 url(r'^participants/$', views.GeneralParticipants.as_view(), name='participants_general'), 6 url(r'^participants/$', views.GeneralParticipants.as_view(), name='participants_general'),
7 - url(r'^render_message/([\w_-]+)/$', views.render_message, name='render_message'), 7 + url(r'^categories/$', views.CategoryIndex.as_view(), name='manage_category'),
  8 + url(r'^category/talks/(?P<category>[\w_-]+)/$', views.CategoryTalks.as_view(), name='category_talks'),
  9 + url(r'^category/participants/(?P<category>[\w_-]+)/$', views.CategoryParticipants.as_view(), name='participants_category'),
  10 + url(r'^render_message/([\w_-]+)/([\w_-]+)/([\w_-]+)/([\w_-]+)/([\w.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})/$', views.render_message, name='render_message'),
8 url(r'^favorite/([\w_-]+)/$', views.favorite, name='favorite'), 11 url(r'^favorite/([\w_-]+)/$', views.favorite, name='favorite'),
9 url(r'^load_messages/([\w_-]+)/$', views.load_messages, name='load_messages'), 12 url(r'^load_messages/([\w_-]+)/$', views.load_messages, name='load_messages'),
10 url(r'^talk/(?P<email>[\w.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})/$', views.GetTalk.as_view(), name = 'talk'), 13 url(r'^talk/(?P<email>[\w.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})/$', views.GetTalk.as_view(), name = 'talk'),
@@ -39,7 +39,7 @@ class GeneralIndex(LoginRequiredMixin, generic.ListView): @@ -39,7 +39,7 @@ class GeneralIndex(LoginRequiredMixin, generic.ListView):
39 user = self.request.user 39 user = self.request.user
40 page = self.request.GET.get('page', False) 40 page = self.request.GET.get('page', False)
41 41
42 - conversations = Conversation.objects.filter(Q(user_one = user) | Q(user_two = user)) 42 + conversations = Conversation.objects.filter((Q(user_one = user) | Q(user_two = user)) & Q(categorytalk__isnull = True) & Q(subjecttalk__isnull = True))
43 43
44 self.totals['general'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__generaltalk__isnull = False).count() 44 self.totals['general'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__generaltalk__isnull = False).count()
45 self.totals['category'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__categorytalk__isnull = False).count() 45 self.totals['category'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__categorytalk__isnull = False).count()
@@ -88,6 +88,91 @@ class GeneralParticipants(LoginRequiredMixin, generic.ListView): @@ -88,6 +88,91 @@ class GeneralParticipants(LoginRequiredMixin, generic.ListView):
88 88
89 return context 89 return context
90 90
  91 +class CategoryIndex(LoginRequiredMixin, generic.ListView):
  92 + login_url = reverse_lazy("users:login")
  93 + redirect_field_name = 'next'
  94 +
  95 + template_name = 'chat/list_category.html'
  96 + context_object_name = "categories"
  97 + paginate_by = 10
  98 +
  99 + totals = {}
  100 +
  101 + def get_queryset(self):
  102 + user = self.request.user
  103 + page = self.request.GET.get('page', False)
  104 +
  105 + if user.is_staff:
  106 + categories = Category.objects.all()
  107 + else:
  108 + categories = Category.objects.filter(Q(coordinators__pk = user.pk) | Q(subject_category__professor__pk = user.pk) | Q(subject_category__students__pk = user.pk, visible = True)).distinct()
  109 +
  110 + self.totals['general'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__generaltalk__isnull = False).count()
  111 + self.totals['category'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__categorytalk__isnull = False).count()
  112 + self.totals['subject'] = ChatVisualizations.objects.filter(user = user, viewed = False, message__talk__subjecttalk__isnull = False).count()
  113 +
  114 + return categories
  115 +
  116 + def get_context_data(self, **kwargs):
  117 + context = super(CategoryIndex, self).get_context_data(**kwargs)
  118 +
  119 + context['title'] = _('Messages per Category')
  120 + context['totals'] = self.totals
  121 + context['chat_menu_active'] = 'subjects_menu_active'
  122 +
  123 + return context
  124 +
  125 +class CategoryTalks(LoginRequiredMixin, generic.ListView):
  126 + login_url = reverse_lazy("users:login")
  127 + redirect_field_name = 'next'
  128 +
  129 + template_name = 'chat/_talks_list.html'
  130 + context_object_name = "conversations"
  131 +
  132 + def get_queryset(self):
  133 + user = self.request.user
  134 + cat = self.kwargs.get('category', 0)
  135 +
  136 + conversations = CategoryTalk.objects.filter((Q(user_one = user) | Q(user_two = user)) & Q(space__id = cat))
  137 +
  138 + print(cat)
  139 +
  140 + return conversations
  141 +
  142 + def get_context_data(self, **kwargs):
  143 + context = super(CategoryTalks, self).get_context_data(**kwargs)
  144 +
  145 + context['space'] = self.kwargs.get('category', 0)
  146 + context['space_type'] = 'category'
  147 +
  148 + return context
  149 +
  150 +class CategoryParticipants(LoginRequiredMixin, generic.ListView):
  151 + login_url = reverse_lazy("users:login")
  152 + redirect_field_name = 'next'
  153 +
  154 + template_name = 'chat/_participants.html'
  155 + context_object_name = "participants"
  156 +
  157 + def get_queryset(self):
  158 + user = self.request.user
  159 + cat = self.kwargs.get('category', 0)
  160 + search = self.request.GET.get('search', '')
  161 +
  162 + print(search)
  163 +
  164 + users = User.objects.filter((Q(username__icontains = search) | Q(last_name__icontains = search) | Q(social_name__icontains = search) | Q(email__icontains = search)) & (Q(is_staff = True) | Q(subject_student__category__id = cat) | Q(professors__category__id = cat) | Q(coordinators__id = cat))).distinct().order_by('social_name','username').exclude(email = user.email)
  165 +
  166 + return users
  167 +
  168 + def get_context_data(self, **kwargs):
  169 + context = super(CategoryParticipants, self).get_context_data(**kwargs)
  170 +
  171 + context['space'] = self.kwargs.get('category', 0)
  172 + context['space_type'] = 'category'
  173 +
  174 + return context
  175 +
91 class ParticipantProfile(LoginRequiredMixin, generic.DetailView): 176 class ParticipantProfile(LoginRequiredMixin, generic.DetailView):
92 login_url = reverse_lazy("users:login") 177 login_url = reverse_lazy("users:login")
93 redirect_field_name = 'next' 178 redirect_field_name = 'next'
@@ -129,6 +214,9 @@ class GetTalk(LoginRequiredMixin, generic.ListView): @@ -129,6 +214,9 @@ class GetTalk(LoginRequiredMixin, generic.ListView):
129 214
130 messages = TalkMessages.objects.filter(talk = talk).order_by('-create_date') 215 messages = TalkMessages.objects.filter(talk = talk).order_by('-create_date')
131 216
  217 + views = ChatVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(message__talk = talk)))
  218 + views.update(viewed = True, date_viewed = datetime.now())
  219 +
132 return messages 220 return messages
133 221
134 def get_context_data(self, **kwargs): 222 def get_context_data(self, **kwargs):
@@ -141,7 +229,7 @@ class GetTalk(LoginRequiredMixin, generic.ListView): @@ -141,7 +229,7 @@ class GetTalk(LoginRequiredMixin, generic.ListView):
141 context['space'] = self.request.GET.get('space', '0') 229 context['space'] = self.request.GET.get('space', '0')
142 context['space_type'] = self.request.GET.get('space_type', 'general') 230 context['space_type'] = self.request.GET.get('space_type', 'general')
143 context['form'] = ChatMessageForm() 231 context['form'] = ChatMessageForm()
144 - context['form_url'] = reverse_lazy('chat:create', args = (), kwargs = {'email': self.kwargs.get('email', ''), 'talk_id': self.talk_id, 'space': self.kwargs.get('space', '0'), 'space_type': self.kwargs.get('space_type', 'general')}) 232 + context['form_url'] = reverse_lazy('chat:create', args = (), kwargs = {'email': self.kwargs.get('email', ''), 'talk_id': self.talk_id, 'space': self.request.GET.get('space', '0'), 'space_type': self.request.GET.get('space_type', 'general')})
145 233
146 return context 234 return context
147 235
@@ -216,17 +304,19 @@ class SendMessage(LoginRequiredMixin, generic.edit.CreateView): @@ -216,17 +304,19 @@ class SendMessage(LoginRequiredMixin, generic.edit.CreateView):
216 return context 304 return context
217 305
218 def get_success_url(self): 306 def get_success_url(self):
219 - return reverse_lazy('chat:render_message', args = (self.object.id, )) 307 + return reverse_lazy('chat:render_message', args = (self.object.id, self.object.talk.id, self.kwargs.get('space', '0'), self.kwargs.get('space_type', 'general'), self.kwargs.get('email', ''),))
220 308
221 -def render_message(request, talk_msg): 309 +def render_message(request, talk_msg, talk_id, space, space_type, email):
222 msg = get_object_or_404(TalkMessages, id = talk_msg) 310 msg = get_object_or_404(TalkMessages, id = talk_msg)
223 311
224 context = {} 312 context = {}
225 context['talk_msg'] = msg 313 context['talk_msg'] = msg
226 314
  315 + form_url = reverse_lazy('chat:create', args = (), kwargs = {'email': email, 'talk_id': talk_id, 'space': space, 'space_type': space_type})
  316 +
227 html = render_to_string("chat/_message.html", context, request) 317 html = render_to_string("chat/_message.html", context, request)
228 318
229 - return JsonResponse({'view': html, 'new_id': msg.id, 'talk_id': msg.talk.id}) 319 + return JsonResponse({'view': html, 'new_id': msg.id, 'talk_id': msg.talk.id, 'new_form_url': form_url})
230 320
231 @login_required 321 @login_required
232 def favorite(request, message): 322 def favorite(request, message):
@@ -270,11 +360,6 @@ def load_messages(request, talk): @@ -270,11 +360,6 @@ def load_messages(request, talk):
270 360
271 has_page = request.GET.get('page', None) 361 has_page = request.GET.get('page', None)
272 362
273 - if has_page is None:  
274 - views = ChatVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(message__talk__id = talk)))  
275 - n_views = views.count()  
276 - views.update(viewed = True, date_viewed = datetime.now())  
277 -  
278 paginator = Paginator(messages.order_by("-create_date"), 20) 363 paginator = Paginator(messages.order_by("-create_date"), 20)
279 364
280 try: 365 try:
@@ -291,4 +376,4 @@ def load_messages(request, talk): @@ -291,4 +376,4 @@ def load_messages(request, talk):
291 376
292 response = render_to_string("chat/_list_messages.html", context, request) 377 response = render_to_string("chat/_list_messages.html", context, request)
293 378
294 - return JsonResponse({"messages": response, "unviewed": n_views, "count": messages.count(), "num_pages": paginator.num_pages, "num_page": page_obj.number})  
295 \ No newline at end of file 379 \ No newline at end of file
  380 + return JsonResponse({"messages": response, "count": messages.count(), "num_pages": paginator.num_pages, "num_page": page_obj.number})
296 \ No newline at end of file 381 \ No newline at end of file
reports/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-03-20 18:40-0300\n" 11 +"POT-Creation-Date: 2017-03-24 18:33-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,7 +50,7 @@ msgstr &quot;Mural da disciplina&quot; @@ -50,7 +50,7 @@ msgstr &quot;Mural da disciplina&quot;
50 msgid "Messages" 50 msgid "Messages"
51 msgstr "Mensagens" 51 msgstr "Mensagens"
52 52
53 -#: forms.py:52 53 +#: forms.py:52 views.py:133 views.py:200
54 msgid "All" 54 msgid "All"
55 msgstr "Todos" 55 msgstr "Todos"
56 56
@@ -127,84 +127,88 @@ msgid &quot;register(s)&quot; @@ -127,84 +127,88 @@ msgid &quot;register(s)&quot;
127 msgstr "registro(s)" 127 msgstr "registro(s)"
128 128
129 #: templates/reports/view.html:68 129 #: templates/reports/view.html:68
130 -msgid "Interactions Data"  
131 -msgstr "Dados de interação" 130 +msgid "Interactions Data (.csv)"
  131 +msgstr "Dados de interação (.csv)"
132 132
133 -#: views.py:67 133 +#: templates/reports/view.html:72
  134 +msgid "Interactions Data (.xls)"
  135 +msgstr "Dados de interação (.xls)"
  136 +
  137 +#: views.py:70
134 msgid "Report created successfully" 138 msgid "Report created successfully"
135 msgstr "Relatório criado com sucesso!" 139 msgstr "Relatório criado com sucesso!"
136 140
137 -#: views.py:169 141 +#: views.py:224
138 msgid "Number of help posts created by the user." 142 msgid "Number of help posts created by the user."
139 msgstr "Número de postagens de dúvidas criadas no mural da disciplina." 143 msgstr "Número de postagens de dúvidas criadas no mural da disciplina."
140 144
141 -#: views.py:175 145 +#: views.py:230
142 msgid "Amount of comments on help posts created by the student." 146 msgid "Amount of comments on help posts created by the student."
143 msgstr "" 147 msgstr ""
144 "Número de comentários criados para as próprias postagens de dúvidas no mural " 148 "Número de comentários criados para as próprias postagens de dúvidas no mural "
145 "da disciplina." 149 "da disciplina."
146 150
147 -#: views.py:180 151 +#: views.py:235
148 msgid "Amount of comments made by the student on teachers help posts." 152 msgid "Amount of comments made by the student on teachers help posts."
149 msgstr "" 153 msgstr ""
150 "Número de comentários às postagens de dúvidas no mural da disciplina criadas " 154 "Número de comentários às postagens de dúvidas no mural da disciplina criadas "
151 "pelo professor." 155 "pelo professor."
152 156
153 -#: views.py:184 157 +#: views.py:239
154 msgid "Amount of comments made by the student on other students help posts." 158 msgid "Amount of comments made by the student on other students help posts."
155 msgstr "" 159 msgstr ""
156 "Número de comentários às postagens de dúvidas no mural da disciplina criadas " 160 "Número de comentários às postagens de dúvidas no mural da disciplina criadas "
157 "por outros estudantes." 161 "por outros estudantes."
158 162
159 -#: views.py:195 163 +#: views.py:250
160 msgid "Number of help posts created by the user that the teacher commented on." 164 msgid "Number of help posts created by the user that the teacher commented on."
161 msgstr "" 165 msgstr ""
162 "Número de comentários às postagens de dúvidas no mural da disciplina criadas " 166 "Número de comentários às postagens de dúvidas no mural da disciplina criadas "
163 "por outros estudantes" 167 "por outros estudantes"
164 168
165 -#: views.py:203 169 +#: views.py:258
166 msgid "Number of help posts created by the user others students commented on." 170 msgid "Number of help posts created by the user others students commented on."
167 msgstr "" 171 msgstr ""
168 " Número de postagens de dúvidas criadas no mural da disciplina que foram " 172 " Número de postagens de dúvidas criadas no mural da disciplina que foram "
169 "comentadas por outros estudantes." 173 "comentadas por outros estudantes."
170 174
171 -#: views.py:206 175 +#: views.py:261
172 msgid "Number of student visualizations on the mural of the subject." 176 msgid "Number of student visualizations on the mural of the subject."
173 msgstr "Número de visualizações do mural da disciplina." 177 msgstr "Número de visualizações do mural da disciplina."
174 178
175 -#: views.py:218 179 +#: views.py:273
176 msgid "Number of access to mural between 6 a.m to 12a.m. ." 180 msgid "Number of access to mural between 6 a.m to 12a.m. ."
177 msgstr "" 181 msgstr ""
178 "Número de acessos ao ambiente virtual da disciplina no horário de 06h às 12h." 182 "Número de acessos ao ambiente virtual da disciplina no horário de 06h às 12h."
179 183
180 -#: views.py:222 184 +#: views.py:277
181 msgid "Number of access to mural between 0 p.m to 6p.m. ." 185 msgid "Number of access to mural between 0 p.m to 6p.m. ."
182 msgstr "" 186 msgstr ""
183 "Número de acessos ao ambiente virtual da disciplina no horário de 12h às 18h." 187 "Número de acessos ao ambiente virtual da disciplina no horário de 12h às 18h."
184 188
185 -#: views.py:225 189 +#: views.py:280
186 msgid "Number of access to mural between 6 p.m to 12p.m. ." 190 msgid "Number of access to mural between 6 p.m to 12p.m. ."
187 msgstr "" 191 msgstr ""
188 "Número de acessos ao ambiente virtual da disciplina no horário de 18h às 24h." 192 "Número de acessos ao ambiente virtual da disciplina no horário de 18h às 24h."
189 193
190 -#: views.py:229 194 +#: views.py:284
191 msgid "Number of access to mural between 0 a.m to 6a.m. ." 195 msgid "Number of access to mural between 0 a.m to 6a.m. ."
192 msgstr "" 196 msgstr ""
193 "Número de acessos ao ambiente virtual da disciplina no horário de 24h às 06h." 197 "Número de acessos ao ambiente virtual da disciplina no horário de 24h às 06h."
194 198
195 -#: views.py:237 views.py:240 199 +#: views.py:292 views.py:295
196 msgid "Number of access to the subject on " 200 msgid "Number of access to the subject on "
197 msgstr "Número de acessos ao assunto na(o) " 201 msgstr "Número de acessos ao assunto na(o) "
198 202
199 -#: views.py:243 203 +#: views.py:298
200 msgid "Number of distinct days the user access the subject. " 204 msgid "Number of distinct days the user access the subject. "
201 msgstr "Número de dias distintos que acessou o ambiente virtual da disciplina." 205 msgstr "Número de dias distintos que acessou o ambiente virtual da disciplina."
202 206
203 -#: views.py:244 207 +#: views.py:299
204 msgid "Class" 208 msgid "Class"
205 msgstr "Classe" 209 msgstr "Classe"
206 210
207 -#: views.py:245 211 +#: views.py:300
208 msgid "Performance" 212 msgid "Performance"
209 msgstr "Desempenho" 213 msgstr "Desempenho"
210 214
reports/templates/reports/_form.html
@@ -20,16 +20,16 @@ @@ -20,16 +20,16 @@
20 <div id="general-parameters-div"> 20 <div id="general-parameters-div">
21 <div class="general-parameters-field"> 21 <div class="general-parameters-field">
22 {{form.topic.errors}} 22 {{form.topic.errors}}
23 - <label> {{form.topic.label}} </label> 23 + <label class="form-field-report"> {{form.topic.label}} </label>
24 {% render_field form.topic class="form-control" %} 24 {% render_field form.topic class="form-control" %}
25 </div> 25 </div>
26 <div class="general-parameters-field"> 26 <div class="general-parameters-field">
27 - <label> {{form.init_date.label}} </label> 27 + <label class="form-field-report"> {{form.init_date.label}} </label>
28 {% render_field form.init_date class='form-control date-picker' %} 28 {% render_field form.init_date class='form-control date-picker' %}
29 </div> 29 </div>
30 30
31 <div class="general-parameters-field"> 31 <div class="general-parameters-field">
32 - <label> {{form.end_date.label}} </label> 32 + <label class="form-field-report"> {{form.end_date.label}} </label>
33 {% render_field form.end_date class='form-control date-picker' %} 33 {% render_field form.end_date class='form-control date-picker' %}
34 </div> 34 </div>
35 </div> 35 </div>
reports/views.py
@@ -129,18 +129,22 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView): @@ -129,18 +129,22 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
129 params_data = self.request.GET 129 params_data = self.request.GET
130 subject = Subject.objects.get(id=params_data['subject_id']) 130 subject = Subject.objects.get(id=params_data['subject_id'])
131 context['subject_name'] = subject.name 131 context['subject_name'] = subject.name
132 - context['topic_name'] = params_data['topic'] 132 +
  133 + if params_data['topic'] == _("All"):
  134 + context['topic_name'] = params_data['topic']
  135 + else:
  136 + context['topic_name'] = Topic.objects.get(id=int(params_data['topic'])).name
133 context['init_date'] = params_data['init_date'] 137 context['init_date'] = params_data['init_date']
134 context['end_date'] = params_data['end_date'] 138 context['end_date'] = params_data['end_date']
135 context['subject'] = subject 139 context['subject'] = subject
136 - 140 +
137 #I used getlist method so it can get more than one tag and one resource class_name 141 #I used getlist method so it can get more than one tag and one resource class_name
138 resources = params_data.getlist('resource') 142 resources = params_data.getlist('resource')
139 tags = params_data.getlist('tag') 143 tags = params_data.getlist('tag')
140 144
141 self.from_mural = params_data['from_mural'] 145 self.from_mural = params_data['from_mural']
142 146
143 - context['data'], context['header'] = self.get_mural_data(subject, context['topic_name'], params_data['init_date'], params_data['end_date'], 147 + context['data'], context['header'] = self.get_mural_data(subject, params_data['topic'], params_data['init_date'], params_data['end_date'],
144 resources, tags ) 148 resources, tags )
145 149
146 150
@@ -254,7 +258,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView): @@ -254,7 +258,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
254 interactions[_('Number of help posts created by the user others students commented on.')] = help_posts.filter(user=student, id__in = help_posts_ids).count() 258 interactions[_('Number of help posts created by the user others students commented on.')] = help_posts.filter(user=student, id__in = help_posts_ids).count()
255 259
256 #Number of student visualizations on the mural of the subject 260 #Number of student visualizations on the mural of the subject
257 - interactions[_('Number of student visualizations on the mural of the subject.')] = MuralVisualizations.objects.filter(post__in = SubjectPost.objects.filter(space__id=subject.id), 261 + interactions[_('Number of student visualizations on the mural of the subject.')] = MuralVisualizations.objects.filter(post__in = SubjectPost.objects.filter(space__id=subject.id, create_date__range=(init_date, end_date)),
258 user = student).count() 262 user = student).count()
259 263
260 264
@@ -285,8 +289,9 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView): @@ -285,8 +289,9 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
285 day_names = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"] 289 day_names = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
286 distinct_days = 0 290 distinct_days = 0
287 for day_num in day_numbers: 291 for day_num in day_numbers:
  292 + #day+1 is because the days are started on 1 instead of the lists, which index starts at 0
288 interactions[_('Number of access to the subject on ')+ day_names[day_num]] = Log.objects.filter(action="access", resource="subject", 293 interactions[_('Number of access to the subject on ')+ day_names[day_num]] = Log.objects.filter(action="access", resource="subject",
289 - user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__week_day = day_num, datetime__range = (init_date, end_date)).count() 294 + user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__week_day = day_num+1, datetime__range = (init_date, end_date)).count()
290 #to save the distinct days the user has accessed 295 #to save the distinct days the user has accessed
291 if interactions[_('Number of access to the subject on ')+ day_names[day_num]] > 0: 296 if interactions[_('Number of access to the subject on ')+ day_names[day_num]] > 0:
292 distinct_days += 1 297 distinct_days += 1
requirements.txt
@@ -28,15 +28,18 @@ django-summernote==0.8.6 @@ -28,15 +28,18 @@ django-summernote==0.8.6
28 django-widget-tweaks==1.4.1 28 django-widget-tweaks==1.4.1
29 django-wysiwyg==0.8.0 29 django-wysiwyg==0.8.0
30 djangorestframework==3.4.6 30 djangorestframework==3.4.6
  31 +et-xmlfile==1.0.1
31 file-resubmit==0.1.0 32 file-resubmit==0.1.0
32 gunicorn==19.6.0 33 gunicorn==19.6.0
33 incremental==16.10.1 34 incremental==16.10.1
  35 +jdcal==1.3
34 Jinja2==2.8 36 Jinja2==2.8
35 lxml==3.6.4 37 lxml==3.6.4
36 MarkupSafe==0.23 38 MarkupSafe==0.23
37 msgpack-python==0.4.8 39 msgpack-python==0.4.8
38 numpy==1.12.1 40 numpy==1.12.1
39 oauthlib==1.0.3 41 oauthlib==1.0.3
  42 +openpyxl==2.4.5
40 pandas==0.19.2 43 pandas==0.19.2
41 Pillow==3.3.1 44 Pillow==3.3.1
42 psycopg2==2.6.2 45 psycopg2==2.6.2
@@ -53,4 +56,5 @@ validators==0.11.0 @@ -53,4 +56,5 @@ validators==0.11.0
53 webencodings==0.5 56 webencodings==0.5
54 Werkzeug==0.11.11 57 Werkzeug==0.11.11
55 whitenoise==3.2.2 58 whitenoise==3.2.2
  59 +xlwt==1.2.0
56 zope.interface==4.3.3 60 zope.interface==4.3.3