diff --git a/web/app/assets/javascripts/accounts.js b/web/app/assets/javascripts/accounts.js
index ba06f74c6..f56fa4897 100644
--- a/web/app/assets/javascripts/accounts.js
+++ b/web/app/assets/javascripts/accounts.js
@@ -111,7 +111,7 @@
$('#account-content-scroller').on('click', '#account-edit-audio-link', function(evt) { evt.stopPropagation(); navToEditAudio(); return false; } );
$('#account-content-scroller').on('avatar_changed', '#profile-avatar', function(evt, newAvatarUrl) { evt.stopPropagation(); updateAvatar(newAvatarUrl); return false; })
- $("#account-content-scroller").on('click', '.view-license', function(evt) { @app.layout.showDialog("jamtrack-license-dialog"); return false; } );
+ $("#account-content-scroller").on('click', '#account-view-license-link', function(evt) {evt.stopPropagation(); app.layout.showDialog('jamtrack-license-dialog'); return false; } );
}
function renderAccount() {
diff --git a/web/app/assets/javascripts/dialog/jamtrackLicenseDialog.js b/web/app/assets/javascripts/dialog/jamtrackLicenseDialog.js
new file mode 100644
index 000000000..c74d71e86
--- /dev/null
+++ b/web/app/assets/javascripts/dialog/jamtrackLicenseDialog.js
@@ -0,0 +1,46 @@
+(function(context,$) {
+
+ "use strict";
+ context.JK = context.JK || {};
+ context.JK.JamtrackLicenseDialog = function(app) {
+ var logger = context.JK.logger;
+ var $dialog = null;
+ var dialogId = 'jamtrack-license-dialog';
+
+ function beforeShow(data) {
+ }
+
+ function afterShow(data) {
+ }
+
+ function afterHide() {
+ }
+
+ function showDialog() {
+ return app.layout.showDialog(dialogId);
+ }
+
+ function events() {
+ }
+
+ function initialize() {
+
+ var dialogBindings = {
+ 'beforeShow' : beforeShow,
+ 'afterShow' : afterShow,
+ 'afterHide': afterHide
+ };
+
+ app.bindDialog(dialogId, dialogBindings);
+
+ $dialog = $('[layout-id="' + dialogId + '"]');
+
+ events();
+ }
+
+ this.initialize = initialize;
+ this.showDialog = showDialog;
+ };
+
+ return this;
+})(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/stylesheets/client/jamtrack.css.scss b/web/app/assets/stylesheets/client/jamtrack.css.scss
index 017ad879c..e660b1488 100644
--- a/web/app/assets/stylesheets/client/jamtrack.css.scss
+++ b/web/app/assets/stylesheets/client/jamtrack.css.scss
@@ -193,3 +193,23 @@
}
}
+#jamtrack-license-dialog {
+ .dialog-inner {
+ height: auto;
+ .content-body {
+ max-height: auto;
+ .content-body-scroller {
+ height: 350px;
+ .paragraph {
+ margin-bottom: 1em;
+ }
+ overflow: hidden;
+ }
+ border: 1px solid #222;
+ margin: 4px 4px 8px 4px;
+ }
+ .jamtrack_buttons {
+ margin: 4px 4px 8px 4px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/web/app/views/clients/_account.html.erb b/web/app/views/clients/_account.html.erb
index 6a7c7df5b..9fdc6100a 100644
--- a/web/app/views/clients/_account.html.erb
+++ b/web/app/views/clients/_account.html.erb
@@ -102,7 +102,7 @@
{{data.licenseDetail}}
- JamTracks License
+ JamTracks License
diff --git a/web/app/views/dialogs/_dialogs.html.haml b/web/app/views/dialogs/_dialogs.html.haml
index 2b7ac1206..ee7aad8a9 100644
--- a/web/app/views/dialogs/_dialogs.html.haml
+++ b/web/app/views/dialogs/_dialogs.html.haml
@@ -25,6 +25,7 @@
= render 'dialogs/videoDialog'
= render 'dialogs/friendSelectorDialog'
= render 'dialogs/jamtrackAvailabilityDialog'
+= render 'dialogs/jamtrackLicenseDialog'
= render 'dialogs/clientPreferencesDialog'
= render 'dialogs/audioProfileInvalidDialog'
= render 'dialogs/gettingStartedDialog'
diff --git a/web/app/views/dialogs/_jamtrackLicenseDialog.html.slim b/web/app/views/dialogs/_jamtrackLicenseDialog.html.slim
new file mode 100644
index 000000000..a72c01c06
--- /dev/null
+++ b/web/app/views/dialogs/_jamtrackLicenseDialog.html.slim
@@ -0,0 +1,18 @@
+#jamtrack-license-dialog.dialog.dialog-overlay-sm layout='dialog' layout-id = 'jamtrack-license-dialog'
+ .content-head
+ h1 JamTrack License:
+ .dialog-inner
+ .content-body
+ .content-body-scroller
+ .paragraph
+ | Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam dignissim ut nunc at hendrerit. Vestibulum semper risus a libero fermentum, molestie convallis risus faucibus. Ut molestie hendrerit orci, id laoreet turpis malesuada nec. Cras sem urna, commodo finibus sodales eu, scelerisque et ligula. Vivamus congue urna lobortis, volutpat ex non, facilisis ante. Maecenas laoreet lacus sit amet justo tempus sagittis. Proin eget libero est. Nullam vulputate finibus nibh nec malesuada. Proin at odio dui. Cras venenatis pharetra ipsum sit amet mollis. Vivamus enim lectus, venenatis sit amet velit at, condimentum euismod dolor. Sed ut tellus in lacus finibus maximus quis ac tortor. Nullam ac purus tincidunt, vestibulum magna vel, hendrerit nunc. Nam tincidunt velit ut est congue ultrices. Integer id magna vulputate, consequat ante et, gravida nibh.
+ .paragraph
+ | Etiam ac neque vel ex sagittis cursus ut a nulla. Praesent id pretium metus. Duis rhoncus egestas magna ut fringilla. Aenean et lobortis sem. Duis at turpis luctus, auctor lectus vitae, consectetur ante. Donec feugiat ullamcorper lacus eu ultricies. Sed vitae turpis arcu. Nam faucibus facilisis sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque vel felis rutrum, elementum lacus euismod, ultricies leo.
+ .paragraph
+ | Etiam ac neque vel ex sagittis cursus ut a nulla. Praesent id pretium metus. Duis rhoncus egestas magna ut fringilla. Aenean et lobortis sem. Duis at turpis luctus, auctor lectus vitae, consectetur ante. Donec feugiat ullamcorper lacus eu ultricies. Sed vitae turpis arcu. Nam faucibus facilisis sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque vel felis rutrum, elementum lacus euismod, ultricies leo.
+ .paragraph
+ | Etiam non nisi magna. Sed diam sem, vulputate sit amet odio quis, vulputate pharetra nunc. Morbi commodo lacus in leo semper semper. Sed nulla felis, consequat dignissim dictum eu, elementum eget massa. Nulla luctus condimentum magna. Vestibulum in interdum erat. In porttitor fermentum mi, ac tincidunt nisi interdum vulputate.
+
+ .jamtrack_buttons
+ .right
+ a.button-grey class='btnCancel' layout-action='cancel' OK