summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
authorGiovane <giovaneliberato@gmail.com>2015-09-15 15:22:06 -0300
committerGiovane <giovaneliberato@gmail.com>2015-09-15 17:06:54 -0300
commit75eafc2b5dfa7fa4eaa2a1770fbfcb628727ee47 (patch)
treeb5abfa1ad9dc71d674f4993ffbf3f256a83644ac /web-ui
parent3c20ec828d3a8d5da7bcad4b92c6414f31a32dc6 (diff)
#442 minor changes on feedback component files.
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/js/main.js3
-rw-r--r--web-ui/app/js/page/default.js6
-rw-r--r--web-ui/app/templates/feedback/feedback.hbs2
-rw-r--r--web-ui/test/spec/feedback/feedback.spec.js2
4 files changed, 8 insertions, 5 deletions
diff --git a/web-ui/app/js/main.js b/web-ui/app/js/main.js
index 06eca8dc..5bb1165c 100644
--- a/web-ui/app/js/main.js
+++ b/web-ui/app/js/main.js
@@ -21,6 +21,7 @@ requirejs.config({
paths: {
'mail_list': 'js/mail_list',
'page': 'js/page',
+ 'feedback': 'js/feedback',
'flight': 'bower_components/flight',
'hbs': 'js/generated/hbs',
'helpers': 'js/helpers',
@@ -35,9 +36,9 @@ requirejs.config({
'mixins': 'js/mixins',
'search': 'js/search',
'foundation': 'js/foundation',
+ 'features': 'js/features/features',
'i18next': 'bower_components/i18next/i18next.amd',
'quoted-printable': 'bower_components/quoted-printable',
- 'features': 'js/features/features',
'utf8': 'bower_components/utf8'
}
});
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index d0a8fcd7..08296c33 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -41,9 +41,10 @@ define(
'views/i18n',
'views/recipientListFormatter',
'flight/lib/logger',
- 'feedback/feedback',
'page/logout',
'page/logout_shortcut',
+ 'feedback/feedback',
+ 'feedback/compose_feedback',
'page/version',
],
@@ -73,9 +74,10 @@ define(
viewI18n,
recipientListFormatter,
withLogging,
- feedback,
logout,
logoutShortcut,
+ feedback,
+ compose_feedback,
version) {
'use strict';
diff --git a/web-ui/app/templates/feedback/feedback.hbs b/web-ui/app/templates/feedback/feedback.hbs
index 72f9b94b..7f3f8ef1 100644
--- a/web-ui/app/templates/feedback/feedback.hbs
+++ b/web-ui/app/templates/feedback/feedback.hbs
@@ -1,5 +1,5 @@
<ul id="feedback">
- <a title="Feedback" href="">
+ <a title="Feedback" href="#">
<li>
<div class="fa fa-exclamation-circle"></div>
<i class="shortcut-label"></i> Feedback
diff --git a/web-ui/test/spec/feedback/feedback.spec.js b/web-ui/test/spec/feedback/feedback.spec.js
index d0f936e8..f7011ea9 100644
--- a/web-ui/test/spec/feedback/feedback.spec.js
+++ b/web-ui/test/spec/feedback/feedback.spec.js
@@ -1,7 +1,7 @@
describeComponent('feedback/feedback', function () {
'use strict';
- describe('Feedback form', function () {
+ describe('Feedback link', function () {
var features;
beforeEach(function() {