Fixed bug where only ports of 4 character lengths could be entered, m…

…ake channels an optional field, updated about page on the settings modal. CSS improvements
Phalanxia · Oct 24, 2015 · 0f02816 · 0f02816
1 parent 9650f97
commit 0f02816
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 29 deletions.
diff --git a/less/panel-console.less b/less/panel-console.less
@@ -50,7 +50,7 @@
 	width: 100%;
 	line-height: 25px;
 	flex: 0 0 auto;
-	&:hover { background-color: @white-2; }
+	&:hover { background-color: @white-3; }
 }
 #channel-console output article aside {
 	display: flex;

diff --git a/less/panel-networks.less b/less/panel-networks.less
@@ -102,9 +102,19 @@
 		cursor: pointer;
 		background-color: @darkBlue;
 	}
-	&:nth-child(odd) { background-color: darken(@darkBlue, 2%); }
 }
-.message-source-list li.channel { margin: 0 0 0 14px; }
+.message-source-list li.server { background-color: darken(@darkBlue, 2%); }
+.message-source-list li.channel {
+	margin: 0 0 0 14px;
+	&:before {
+		display: block;
+		position: absolute;
+		top: 5px;
+		height: 30px;
+		border-left: 2px dashed @lightBlue;
+		content: "";
+	}
+}
 .message-source-list li[data-alert]:after {
 	float: right;
 	height: 20px;
@@ -119,19 +129,28 @@
 	border-radius: 4px;
 	content: attr(data-alert);
 }
+.message-source-list li .arrow {
+	display: none;
+	position: absolute;
+	top: 5px;
+	right: 0;
+	overflow: hidden;
+	width: 30px;
+	height: 30px;
+}
+.message-source-list li .arrow span {
+	float: left;
+  margin-left: 25px;
+  width: 30px;
+  height: 30px;
+  background-color: @white-2;
+  border-radius: 2px;
+  transform: rotateZ(45deg);
+}
 .message-source-list li[data-alert=""]:after { display: none; }
 .message-source-list li.focusedSource {
 	&:hover { background-color: @darkBlue; };
-	&:before {
-		position: absolute;
-		top: 12px;
-		right: 0;
-		height: 0;
-		border-top: 7px solid transparent;
-		border-bottom: 7px solid transparent;
-		border-right: 7px solid @white-2;
-		content: "";
-	}
+	.arrow { display: block; }
 }
 .message-source-list i {
 	padding: 0 14px;

diff --git a/less/panel-users.less b/less/panel-users.less
@@ -42,10 +42,6 @@
 		cursor: pointer;
 		background-color: lighten(@white-3, 4%);
 	}
-	&:hover:after {
-		content: attr(data-rank);
-		font-family: 'Open Sans', Helvetica, sans-serif;
-	}
 }
 #users ul li p {
 	padding: 0 0 0 20px;
@@ -61,6 +57,10 @@
 		color: @lightBlue;
 		content: attr(data-rank-icon);
 	}
+	&:hover:after {
+		content: attr(data-rank);
+		font-family: 'Open Sans', Helvetica, sans-serif;
+	}
 }
 #users footer {
 	display: none;

diff --git a/less/standard.less b/less/standard.less
@@ -13,6 +13,7 @@ h6 {
 a {
 	color: @lightBlue;
 	font: inherit;
+	text-decoration: none;
 	&:visited { text-decoration: none; }
 	&:hover { text-decoration: underline; }
 	&:active { text-decoration: none; }

diff --git a/public/js/templates.js b/public/js/templates.js
@@ -1,9 +1,11 @@
+'use strict';
+
 var Templates = {
 	messageSource: {
-		source: '<ul class="message-source-list"><li class="server" data-connection-id="{{connectionId}}" data-value="SERVER"><i class="fa fa-server"></i><span>{{serverName}}</span></li>{{#with sources}}<li class="channel" data-connection-id="{{data.connectionId}}" data-value="{{key}}" data-alert=""><i class="fa fa-comments-o"></i><span>{{key}}</span></li>{{/with}}</ul>'
+		source: '<ul class="message-source-list"><li class="server" data-connection-id="{{connectionId}}" data-value="SERVER"><i class="fa fa-server"></i><span>{{serverName}}</span><div class="arrow"><span></div></li>{{#with sources}}<li class="channel" data-connection-id="{{data.connectionId}}" data-value="{{key}}" data-alert=""><i class="fa fa-comments-o"></i><span>{{key}}</span><div class="arrow"><span></div></li>{{/with}}</ul>'
 	},
 	userList: {
-		source: '<li><p title="{{rank}}" data-rank="{{rank}}" data-rank-icon="{{{icon}}}">{{nick}}</p></li>'
+		source: '<li><p data-rank="{{rank}}" data-rank-icon="{{{icon}}}">{{nick}}</p></li>'
 	},
 	message: {
 		source: '<article class="consoleMessage" data-messageType="{{type}}" data-connection-id="{{connectionId}}" data-source="{{source}}"><aside><time>{{timestamp}}</time><span class="{{icon}}">{{head}}</span></aside><p>{{{message}}}</p></article><article class="filler"><div></div></article>'
@@ -21,7 +23,7 @@ var Partials = {
 Handlebars.registerHelper('with', function(context, options) {
 	var content = (function() {
 		var results = [];
-		for (var key in context) {
+		for (let key in context) {
 			var value = context[key];
 			results.push(options.fn({
 				key: key,
@@ -37,7 +39,7 @@ Handlebars.registerHelper('with', function(context, options) {
 });
 
 // Compile templates and save them back in the template object
-for (var index in Templates) {
+for (let index in Templates) {
 	Templates[index].compiled = Handlebars.compile(Templates[index].source);
 }
 

diff --git a/views/client.jade b/views/client.jade
@@ -3,8 +3,8 @@ html(lang="en")
 	head
 		meta(charset="utf-8")
 		meta(http-equiv="x-ua-compatible", content="ie=edge")
-		title Maid IRC
-		meta(name="description", content="Maid IRC")
+		title Maid-IRC
+		meta(name="description", content="Maid-IRC")
 		meta(name="viewport", content="width=device-width", initial-scale="1", user-scalable="no")
 		meta(name="mobile-web-app-capable", content="yes")
 		meta(name="theme-color", content="rgb(81,176,255)")
@@ -68,8 +68,8 @@ html(lang="en")
 					input#name(type="text", placeholder="Nickname", name="nick", spellcheck="false", autofocus, required)
 					section
 						input#server(type="text", placeholder="Server", name="server", spellcheck="false", required)
-						input#port(type="number", placeholder="Port", name="port", maxlength="4", max="65535", required)
-					input#channel(type="text", placeholder="Channel", name="channel", spellcheck="false", required)
+						input#port(type="number", placeholder="Port", name="port", maxlength="5", max="65535", required)
+					input#channel(type="text", placeholder="Channel", name="channel", spellcheck="false")
 					footer
 						button.btn#submit(type="submit", name="connect") Connect
 						button.btn.fa.fa-gear(type="button")
@@ -95,10 +95,10 @@ html(lang="en")
 			.page#about
 				h1 Maid
 					span IRC
-				p.version Version #{version}
-				a(href="https://github.com/Phalanxia/Maid-IRC", target="_blank") GitHub
-				a(href="https://github.com/Phalanxia/Maid-IRC/issues", target="_blank") Report an issue
-				a(href="https://raw.githubusercontent.com/Phalanxia/Maid-IRC/master/LICENSE", target="_blank") License
+				p.version Running version #{version}
+				a(class="update" href="https://github.com/Phalanxia/Maid-IRC/releases/latest", target="_blank") Check for updates
+				a(class="update" href="https://github.com/Phalanxia/Maid-IRC/blob/master/LICENSE", target="_blank") License
+				br
 				include ./includes/licenses.jade
 
 	// Libraries