Skip to content

Commit

Permalink
Improve connection page
Browse files Browse the repository at this point in the history
  • Loading branch information
@thedjpetersen
thedjpetersen committed Aug 24, 2012
1 parent 0eb6c4a commit 509ff4f
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 42 deletions.
9 changes: 5 additions & 4 deletions assets/css/subway.css
View file
Expand Up @@ -134,10 +134,6 @@ html { overflow: hidden; }
border-left: 5px solid #FA6900; border-left: 5px solid #FA6900;
} }


#user-box div i{
margin-right: 5px;
}

#channels { #channels {
overflow: auto; overflow: auto;
width: 100%; width: 100%;
Expand Down Expand Up @@ -294,6 +290,10 @@ html { overflow: hidden; }
font-size: 1.3em; font-size: 1.3em;
} }


.spacing-right {
margin-right: 5px;
}

.message-box { .message-box {
border-bottom: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD;
display: table; display: table;
Expand Down Expand Up @@ -447,3 +447,4 @@ html { overflow: hidden; }
margin-left: 5px; margin-left: 5px;
color: #666666; color: #666666;
} }

6 changes: 3 additions & 3 deletions assets/js/views/message.js
View file
Expand Up @@ -12,7 +12,7 @@ var MessageView = Backbone.View.extend({
if (_.include(['join', 'part', 'nick', 'topic', 'quit'], this.model.get('type'))) if (_.include(['join', 'part', 'nick', 'topic', 'quit'], this.model.get('type')))
html = this.setText(this.model.get('type')); html = this.setText(this.model.get('type'));
// This handles whether to output a message or an action // This handles whether to output a message or an action
else if (this.model.get('text').substr(1, 6) === 'ACTION') { else if (this.model.get('text') && this.model.get('text').substr(1, 6) === 'ACTION') {
html = ich.action({ html = ich.action({
user: nick, user: nick,
content: this.model.get('text').substr(8), content: this.model.get('text').substr(8),
Expand Down Expand Up @@ -54,7 +54,7 @@ var MessageView = Backbone.View.extend({
//Message resolving to undefined will include again later //Message resolving to undefined will include again later
//message: '(' + this.model.get('message') + ')' //message: '(' + this.model.get('message') + ')'
}); });
break break;
case 'nick': case 'nick':
html = ich.nick({ html = ich.nick({
oldNick: this.model.get('oldNick'), oldNick: this.model.get('oldNick'),
Expand All @@ -66,6 +66,6 @@ var MessageView = Backbone.View.extend({
break; break;
} }
return html; return html;
}, }


}); });
31 changes: 17 additions & 14 deletions assets/js/views/overview.js
View file
Expand Up @@ -5,6 +5,7 @@ var OverviewView = Backbone.View.extend({


events: { events: {
'click #connect-button': 'connect', 'click #connect-button': 'connect',
'click #connect-more-options-button': 'more_options',
'click #login-button': 'login_register', 'click #login-button': 'login_register',
'click #register-button': 'login_register', 'click #register-button': 'login_register',
'keypress': 'connectOnEnter', 'keypress': 'connectOnEnter',
Expand Down Expand Up @@ -47,15 +48,15 @@ var OverviewView = Backbone.View.extend({
event.preventDefault(); event.preventDefault();
$('.error').removeClass('error'); $('.error').removeClass('error');


var server = $('#connect-server').val(); var server = $('#connect-server').val(),
var nick = $('#connect-nick').val(); nick = $('#connect-nick').val(),
var port = $('#connect-port').val(); port = $('#connect-port').val(),
var away = $('#connect-away').val(); away = $('#connect-away').val(),
var realName = $('#connect-realName').val(); realName = $('#connect-realName').val() || nick,
var secure = $('#connect-secure').is(':checked'); secure = $('#connect-secure').is(':checked'),
var selfSigned = $('#connect-selfSigned').is(':checked'); selfSigned = $('#connect-selfSigned').is(':checked'),
var rejoin = $('#connect-rejoin').is(':checked'); rejoin = $('#connect-rejoin').is(':checked'),
var password = $('#connect-password').val(); password = $('#connect-password').val();


if (!server) { if (!server) {
$('#connect-server').closest('.clearfix').addClass('error'); $('#connect-server').closest('.clearfix').addClass('error');
Expand All @@ -74,7 +75,7 @@ var OverviewView = Backbone.View.extend({
var connectInfo = { var connectInfo = {
nick: nick, nick: nick,
server: server, server: server,
port: port, port: port,
secure: secure, secure: secure,
selfSigned: selfSigned, selfSigned: selfSigned,
rejoin: rejoin, rejoin: rejoin,
Expand All @@ -89,6 +90,10 @@ var OverviewView = Backbone.View.extend({
} }
}, },


more_options: function() {
this.$el.find('.connect-more-options').toggleClass('hide');
},

login_register: function(event) { login_register: function(event) {
var action = event.target.innerHTML.toLowerCase() || event.action.toLowerCase(); var action = event.target.innerHTML.toLowerCase() || event.action.toLowerCase();
event.preventDefault(); event.preventDefault();
Expand Down Expand Up @@ -119,10 +124,8 @@ var OverviewView = Backbone.View.extend({
}, },


toggle_ssl_options: function(event) { toggle_ssl_options: function(event) {
var port = $('#connect-secure').is(':checked') ? 6697 : 6667 var port = $('#connect-secure').is(':checked') ? 6697 : 6667 ;
$('#connect-port').attr('placeholder', port) $('#connect-port').attr('placeholder', port);
$('#ssl-self-signed').toggle(); $('#ssl-self-signed').toggle();
} }


}); });
44 changes: 23 additions & 21 deletions views/templates.jade
View file
Expand Up @@ -34,34 +34,36 @@ script(id="overview_connection", type="text/html")
#home_parent #home_parent
a.overview_button#home Home a.overview_button#home Home
form.form-inline form.form-inline
.control-group
label(for="connect-server") Server
input#connect-server(type="text")
.control-group
label(for="connect-port") Port
input#connect-port.input-small(type="text", placeholder="6667")
.control-group
label(for="connect-secure") SSL
input#connect-secure(type="checkbox")
.control-group#ssl-self-signed
label(for="connect-selfSigned") Self-signed SSL Cert
input#connect-selfSigned(type="checkbox")
.control-group .control-group
label(for="connect-nick") Nick label(for="connect-nick") Nick
input#connect-nick(type="text") input#connect-nick(type="text")
.control-group
label(for="connect-server") Server
input#connect-server(type="text")
.control-group .control-group
label(for="connect-password") Password (optional) label(for="connect-password") Password (optional)
input#connect-password(type="password") input#connect-password(type="password")
.control-group .control-group
label(for="connect-realName") Real Name label(for="connect-realName") Real Name
input#connect-realName(type="text") input#connect-realName(type="text")
.control-group .connect-more-options.hide
label(for="connect-away") Away Message .control-group
input#connect-away(type="text", placeholder="AFK") label(for="connect-port") Port
.control-group input#connect-port.input-small(type="text", placeholder="6667")
label(for="connect-rejoin") Bouncer Mode .control-group
input#connect-rejoin(type="checkbox") label(for="connect-secure") SSL
a(id="connect-button", class="btn btn-primary", type="button") Connect input#connect-secure(type="checkbox")
.control-group#ssl-self-signed
label(for="connect-selfSigned") Self-signed SSL Cert
input#connect-selfSigned(type="checkbox")
.control-group
label(for="connect-away") Away Message
input#connect-away(type="text", placeholder="AFK")
.control-group
label(for="connect-rejoin") Bouncer Mode
input#connect-rejoin(type="checkbox")
a(id="connect-button", class="btn btn-primary spacing-right", type="button") Connect
a(id="connect-more-options-button", class="btn", type="button") More Options


script(id="overview_settings", type="text/html") script(id="overview_settings", type="text/html")
#home_parent #home_parent
Expand Down Expand Up @@ -122,10 +124,10 @@ script(id="channel", type="text/html")


script(id="user_box", type="text/html") script(id="user_box", type="text/html")
div div
i(class="icon-user icon-white") i(class="icon-user icon-white spacing-right")
{{nick}} {{nick}}
div div
i(class="icon-asterisk icon-white") i(class="icon-asterisk icon-white spacing-right")
{{server}} {{server}}


script(id="userlist_user", type="text/html") script(id="userlist_user", type="text/html")
Expand Down

0 comments on commit 509ff4f

Please sign in to comment.