diff --git a/web/app/assets/javascripts/hoverBand.js b/web/app/assets/javascripts/hoverBand.js new file mode 100644 index 000000000..076c8f466 --- /dev/null +++ b/web/app/assets/javascripts/hoverBand.js @@ -0,0 +1,14 @@ +(function(context,$) { + + "use strict"; + context.JK = context.JK || {}; + context.JK.BandHoverBubble = function(app) { + + function initialize() { + + } + + this.initialize = initialize; + this.showBubble = showBubble; + } +})(window,jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/hoverFan.js b/web/app/assets/javascripts/hoverFan.js new file mode 100644 index 000000000..aac8914f5 --- /dev/null +++ b/web/app/assets/javascripts/hoverFan.js @@ -0,0 +1,14 @@ +(function(context,$) { + + "use strict"; + context.JK = context.JK || {}; + context.JK.FanHoverBubble = function(app) { + + function initialize() { + + } + + this.initialize = initialize; + this.showBubble = showBubble; + } +})(window,jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/hoverMusician.js b/web/app/assets/javascripts/hoverMusician.js new file mode 100644 index 000000000..168eae817 --- /dev/null +++ b/web/app/assets/javascripts/hoverMusician.js @@ -0,0 +1,16 @@ +(function(context,$) { + + "use strict"; + context.JK = context.JK || {}; + context.JK.MusicianHoverBubble = function(app, user, position) { + var logger = context.JK.logger; + var rest = context.JK.Rest(); + + function showBubble() { + $("#musician-hover").css({left: position.left; top: position.top}); + } + + this.initialize = initialize; + this.showBubble = showBubble; + } +})(window,jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/hoverRecording.js b/web/app/assets/javascripts/hoverRecording.js new file mode 100644 index 000000000..68718743c --- /dev/null +++ b/web/app/assets/javascripts/hoverRecording.js @@ -0,0 +1,14 @@ +(function(context,$) { + + "use strict"; + context.JK = context.JK || {}; + context.JK.RecordingHoverBubble = function(app) { + + function initialize() { + + } + + this.initialize = initialize; + this.showBubble = showBubble; + } +})(window,jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/hoverSession.js b/web/app/assets/javascripts/hoverSession.js new file mode 100644 index 000000000..7bfe105cf --- /dev/null +++ b/web/app/assets/javascripts/hoverSession.js @@ -0,0 +1,14 @@ +(function(context,$) { + + "use strict"; + context.JK = context.JK || {}; + context.JK.SessionHoverBubble = function(app) { + + function initialize() { + + } + + this.initialize = initialize; + this.showBubble = showBubble; + } +})(window,jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/shareDialog.js b/web/app/assets/javascripts/shareDialog.js index a8a26d4e0..1dbc2fec9 100644 --- a/web/app/assets/javascripts/shareDialog.js +++ b/web/app/assets/javascripts/shareDialog.js @@ -338,14 +338,6 @@ return false; }) - /* - $("#btn-share-copy").zclip({ - path: 'zeroclipboard.swf', - copy: function() { - // console.log("copied " + $(".link-contents").text()); - return "TEXT"; - } - });*/ } function showDialog() { @@ -416,10 +408,6 @@ } } - function clearTextFields() { - - } - function beforeShow() { disableTwitter(); // no disableFacebook on purpose @@ -477,7 +465,7 @@ registerEvents(false); } - function initialize(_facebookHelper){ + function initialize(_facebookHelper) { facebookHelper = _facebookHelper; var dialogBindings = { @@ -491,11 +479,11 @@ initDialog(); facebookHelper.deferredLoginStatus().done(function(response) { handleFbStateChange(response); }); - }; + } this.initialize = initialize; this.showDialog = showDialog; } return this; -})(window,jQuery) \ No newline at end of file +})(window,jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index 1fe7623c8..804f3e03b 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -141,6 +141,7 @@ $element.bt(text, options); } + // Uber-simple templating // var template = "Hey {name}"; // var vals = { name: "Jon" }; @@ -650,7 +651,7 @@ if(context.JK.CurrentSessionModel.recordingModel.isRecording()) { app.notify({ title: "Currently Recording", - text: "Tracks can not be modified while recording.", + text: "Tracks cannot be modified while recording.", icon_url: "/assets/content/icon_alert_big.png"}); return false; } diff --git a/web/app/assets/stylesheets/client/hoverBubble.css.scss b/web/app/assets/stylesheets/client/hoverBubble.css.scss index e69de29bb..0e714e024 100644 --- a/web/app/assets/stylesheets/client/hoverBubble.css.scss +++ b/web/app/assets/stylesheets/client/hoverBubble.css.scss @@ -0,0 +1,32 @@ +.bubble { + width:350px; + min-height:200px; + background-color:#242323; + border:solid 1px #ed3618; + position:absolute; + z-index:999; +} + +.bubble h2 { + padding:6px 0px; + text-align:center; + font-size:15px; + font-weight:200; + width:100%; + background-color:#ed3618; +} + +.bubble h3 { + font-weight:400; + font-size:16px; + color:#fff; +} + +.bubble-inner { + padding:10px; + color:#ccc; +} + +.bubble-inner div.mb { + margin-bottom:5px; +} \ No newline at end of file diff --git a/web/app/views/clients/_hoverMusician.html.erb b/web/app/views/clients/_hoverMusician.html.erb index e69de29bb..d9e2c89a4 100644 --- a/web/app/views/clients/_hoverMusician.html.erb +++ b/web/app/views/clients/_hoverMusician.html.erb @@ -0,0 +1,48 @@ + \ No newline at end of file