From 61b2e8f0bf43b4fabcbd9de11b5436d8fbe3460f Mon Sep 17 00:00:00 2001 From: kracekumar Date: Thu, 12 Sep 2013 14:54:39 +0530 Subject: [PATCH 1/3] Added scrollback support. Issue #249 --- hacknight/templates/event.html | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/hacknight/templates/event.html b/hacknight/templates/event.html index dab0a3e..ef60b4a 100644 --- a/hacknight/templates/event.html +++ b/hacknight/templates/event.html @@ -126,6 +126,9 @@

Share

+
+ Collaborate in IRC Channel +
{% if event.sponsors %}
@@ -235,7 +238,23 @@

New project...

function onZoomend(){ map.setView(venue, map.getZoom()); }; - {% endif %} + {% endif %} + //Scrollback + $("a[href='irc://irc.freenode.net/#hasgeek']").click(function(e) { + if(window.scrollback) return true; + + window.scrollback = { + streams:['hasgeek'], theme: 'light', ticker: true, minimized: false + }; + /***** don't edit below *****/ + (function(d, s, h, e){e=d.createElement(s);e.async=1; + e.src=h+'/client.min.js';scrollback.host=h; + d.getElementsByTagName(s)[0].parentNode.appendChild(e);} + (document,'script',location.protocol+'//scrollback.io')); + + e.preventDefault(); + return false; + }); }); From 932e395f2a52b3a898335ac1cbe331506dfcacb0 Mon Sep 17 00:00:00 2001 From: kracekumar Date: Mon, 30 Sep 2013 19:17:11 +0530 Subject: [PATCH 2/3] WIP --- hacknight/forms/event.py | 15 +++++++++++++++ hacknight/models/event.py | 1 + hacknight/templates/event.html | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/hacknight/forms/event.py b/hacknight/forms/event.py index 86ff87e..f6d4e6d 100644 --- a/hacknight/forms/event.py +++ b/hacknight/forms/event.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import re from flask import Markup import wtforms import wtforms.fields.html5 @@ -50,12 +51,26 @@ class EventForm(Form): ticket_price = wtforms.TextField("Ticket price", description="Entry fee, if any, to be paid at the venue", validators=[wtforms.validators.length(max=250)]) maximum_participants = wtforms.IntegerField("Venue capacity", description="The number of people this venue can accommodate.", default=50, validators=[wtforms.validators.Required()]) website = wtforms.fields.html5.URLField("Website", description="Related Website (Optional)", validators=[wtforms.validators.Optional(), wtforms.validators.length(max=250), wtforms.validators.URL()]) + irc_channel_url = wtforms.fields.html5.URLField("IRC Channel URL", description="IRC Channel for participants collaboration (Optional). E.G: irc://irc.freenode.net/#hasgeek", validators=[wtforms.validators.Optional(), wtforms.validators.length(max=250)]) status = wtforms.SelectField("Event status", description="Current status of this hacknight", coerce=int, choices=STATUS_CHOICES) def validate_end_datetime(self, field): if field.data < self.start_datetime.data: raise wtforms.ValidationError(u"Your event can’t end before it starts.") + def validate_irc_channel_url(self, field): + pattern = "irc://irc\.([a-zA-Z0-9_-]{4,20})\.([a-zA-Z]{2,7})/([#a-zA-Z-_0-9]{2,20})" + """ + Above pattern will match following + irc://irc.freenode.net/#hasgeek + irc://irc.freenode.net/##hasgeek + irc://irc.freenode.net/##linux-india + irc://irc.free.net/##linux-india + irc://irc.fre23.net/##linux-india + """ + if not re.match(pattern, field.data): + raise wtforms.ValidationError(u"Invalid IRC Channel URL. E.G: irc://irc.freenode.net/#hasgeek") + class EmailEventParticipantsForm(Form): pending_message = RichTextField("Pending Message", description="Message to be sent for pending participants. '*|FULLNAME|*' will be replaced with user's fullname.", validators=[wtforms.validators.Optional()], tinymce_options = {'convert_urls': False, 'remove_script_host': False}) diff --git a/hacknight/models/event.py b/hacknight/models/event.py index 8441d44..073f2ef 100644 --- a/hacknight/models/event.py +++ b/hacknight/models/event.py @@ -75,6 +75,7 @@ class Event(BaseScopedNameMixin, db.Model): rejected_message_text = deferred(db.Column(db.UnicodeText, nullable=False, default=u'')) pending_message = deferred(db.Column(db.UnicodeText, nullable=False, default=u'')) pending_message_text = deferred(db.Column(db.UnicodeText, nullable=False, default=u'')) + irc_channel_url = db.Column(db.Unicode(250), default=u'', nullable=False) __table_args__ = (db.UniqueConstraint('name', 'profile_id'),) diff --git a/hacknight/templates/event.html b/hacknight/templates/event.html index ef60b4a..0f4c993 100644 --- a/hacknight/templates/event.html +++ b/hacknight/templates/event.html @@ -126,9 +126,11 @@

Share

-
- Collaborate in IRC Channel -
+ {%- if event.irc_channel_url -%} +
+ Collaborate in IRC Channel +
+ {%- endif -%} {% if event.sponsors %}
@@ -240,11 +242,13 @@

New project...

}; {% endif %} //Scrollback - $("a[href='irc://irc.freenode.net/#hasgeek']").click(function(e) { + $(".irc").click(function(e) { if(window.scrollback) return true; - + + var channel = "{{ event.irc_channel_url }}".split("#"); + channel_name = channel[channel.length - 1]; window.scrollback = { - streams:['hasgeek'], theme: 'light', ticker: true, minimized: false + streams:[channel_name], theme: 'light', ticker: true, minimized: false }; /***** don't edit below *****/ (function(d, s, h, e){e=d.createElement(s);e.async=1; @@ -255,6 +259,9 @@

New project...

e.preventDefault(); return false; }); + /*$(".irc").click(function(e){ + console.log(window.scrollback); + });*/ }); From 38311f9a39e33aaf6aeda167aaa423da9c9d0042 Mon Sep 17 00:00:00 2001 From: kracekumar Date: Wed, 30 Oct 2013 12:25:20 +0530 Subject: [PATCH 3/3] Switching over --- hacknight/models/event.py | 2 +- hacknight/templates/event.html | 47 ++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/hacknight/models/event.py b/hacknight/models/event.py index 073f2ef..7c89399 100644 --- a/hacknight/models/event.py +++ b/hacknight/models/event.py @@ -75,7 +75,7 @@ class Event(BaseScopedNameMixin, db.Model): rejected_message_text = deferred(db.Column(db.UnicodeText, nullable=False, default=u'')) pending_message = deferred(db.Column(db.UnicodeText, nullable=False, default=u'')) pending_message_text = deferred(db.Column(db.UnicodeText, nullable=False, default=u'')) - irc_channel_url = db.Column(db.Unicode(250), default=u'', nullable=False) + irc_channel_url = db.Column(db.Unicode(250), nullable=True) __table_args__ = (db.UniqueConstraint('name', 'profile_id'),) diff --git a/hacknight/templates/event.html b/hacknight/templates/event.html index 0f4c993..67b6826 100644 --- a/hacknight/templates/event.html +++ b/hacknight/templates/event.html @@ -242,26 +242,39 @@

New project...

}; {% endif %} //Scrollback - $(".irc").click(function(e) { - if(window.scrollback) return true; + $(".irc").on('click', function(e){ - var channel = "{{ event.irc_channel_url }}".split("#"); - channel_name = channel[channel.length - 1]; - window.scrollback = { - streams:[channel_name], theme: 'light', ticker: true, minimized: false - }; - /***** don't edit below *****/ - (function(d, s, h, e){e=d.createElement(s);e.async=1; - e.src=h+'/client.min.js';scrollback.host=h; - d.getElementsByTagName(s)[0].parentNode.appendChild(e);} - (document,'script',location.protocol+'//scrollback.io')); + var channel = "{{ event.irc_channel_url }}"; + console.log(channel); + if (channel !== ""){ + + channel_name = channel.split("#"); + name = channel_name[channel_name.length - 1]; + console.log(name); + if (name){ + if(window.scrollback) return true; - e.preventDefault(); - return false; + if ("{{ g.user }}"){ + window.scrollback = { + streams:[name], theme: 'light', ticker: true, minimized: false, nickname: "{{g.user.username}}" + }; + } else { + window.scrollback = { + streams:[channel_name], theme: 'light', ticker: true, minimized: false + }; + } + /***** don't edit below *****/ + console.log(window.scrollback); + (function(d, s, h, e){e=d.createElement(s);e.async=1; + e.src=h+'/client.min.js';scrollback.host=h; + d.getElementsByTagName(s)[0].parentNode.appendChild(e);} + (document,'script',location.protocol+'//scrollback.io')); + + e.preventDefault(); + return false; + } + } }); - /*$(".irc").click(function(e){ - console.log(window.scrollback); - });*/ });