From ab937dbedd21d1e53e8900281cfeadd278a1f10e Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Mon, 17 Jun 2013 20:42:30 +0100 Subject: [PATCH] Moar kittehs... --- static/img/beg.jpg | Bin 0 -> 4735 bytes static/js/app/lib/utils.coffee | 2 +- static/js/app/lib/utils.js | 2 +- templates/javascript/settings.js | 1 + templates/views/dlg/PlayCountLoginAlert.html | 19 +++++++++++++++---- templates/views/dlg/_DialogBase.html | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 static/img/beg.jpg diff --git a/static/img/beg.jpg b/static/img/beg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..98a66a838f8ab0b565c9b479679eccbd69502864 GIT binary patch literal 4735 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 if document.cookie.indexOf("sessionId") $.getJSON "/ajax/session_play_count", (data) => console.log "utils: got playcount" - @modal "dlg/PlayCountLoginAlert" if (data.play_count isnt 0) and (data.play_count % 5) is 0 + @modal "dlg/PlayCountLoginAlert" if (data.play_count isnt 0) and (data.play_count % com.podnoms.settings.nag_count) is 0 true showError: (title, message) => diff --git a/static/js/app/lib/utils.js b/static/js/app/lib/utils.js index a88dbd1..4933f18 100644 --- a/static/js/app/lib/utils.js +++ b/static/js/app/lib/utils.js @@ -27,7 +27,7 @@ if (document.cookie.indexOf("sessionId")) { $.getJSON("/ajax/session_play_count", function(data) { console.log("utils: got playcount"); - if ((data.play_count !== 0) && (data.play_count % 5) === 0) { + if ((data.play_count !== 0) && (data.play_count % com.podnoms.settings.nag_count) === 0) { return _this.modal("dlg/PlayCountLoginAlert"); } }); diff --git a/templates/javascript/settings.js b/templates/javascript/settings.js index 1f7b9da..47fdf81 100644 --- a/templates/javascript/settings.js +++ b/templates/javascript/settings.js @@ -9,6 +9,7 @@ com.podnoms.settings = { liveStreamRoot: 'http://{{ LIVE_STREAM_URL }}:{{ LIVE_STREAM_PORT }}/{{ LIVE_STREAM_MOUNT }}', streamInfoUrl: 'http://{{ LIVE_STREAM_INFO_URL }}', volume: '{{ DEFAULT_AUDIO_VOLUME }}', + nag_count: {{ NAG_COUNT }}, smDebugMode: {{ SM_DEBUG_MODE }}, isDebug: {{ IS_DEBUG }}, drawTimelineOnMix: false, diff --git a/templates/views/dlg/PlayCountLoginAlert.html b/templates/views/dlg/PlayCountLoginAlert.html index 1a0b022..d7d65ed 100644 --- a/templates/views/dlg/PlayCountLoginAlert.html +++ b/templates/views/dlg/PlayCountLoginAlert.html @@ -6,9 +6,20 @@

Hey There!!

{% endblock %} {% block content %} - We've noticed you've been playing a few mixes now.
- This is cool and we're happy you're enjoying the site but we would love it
- if you would consider logging in.
- This will let you comment on mixes and even download them + +
+ kitteh +
+
+ We've noticed you've played a few mixes. +
+ + We're happy you're enjoying the site but we would love it + if you would consider logging in.
+ This will let you comment on mixes and even download them! + +
+
{% endblock %} {% block primarybutton %}Okies...{% endblock %} \ No newline at end of file diff --git a/templates/views/dlg/_DialogBase.html b/templates/views/dlg/_DialogBase.html index 507ad9b..8fb4972 100644 --- a/templates/views/dlg/_DialogBase.html +++ b/templates/views/dlg/_DialogBase.html @@ -1,4 +1,4 @@ -
+
{% block header %}