tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Do channel indendation in CSS.

Browse source 
Fixes the issue with new query buffers' titles not being shown.

Doesn't introduce any new watchers
This commit is contained in:
Lorenz H-S 2014-02-02 11:26:43 +00:00
parent 1bf6f98bde
commit f0fe8be18a
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
css/glowingbear.css
View file

@ -176,6 +176,11 @@ input[type=text], input[type=password], .badge {
border-radius: 0;
margin-right: -15px;
}
#sidebar ul.indented li.indent span.buffername {
padding-left: 10px;
}
#nicklist {
position: fixed;
width: 100px;

6
index.html
View file

@ -257,17 +257,17 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
</div>
</div>
<div id="sidebar" class="vertical-line collapse in">
<ul class="nav nav-pills nav-stacked">
<ul class="nav nav-pills nav-stacked" ng-class="{'indented': (predicate === 'serverSortKey')}">
<li class="bufferfilter">
<form role="form">
<input class="form-control monospace" type="text" id="bufferFilter" ng-model="search" ng-keydown="handleSearchBoxKey($event)" placeholder="Search">
</form>
</li>
<li class="buffer" ng-class="{'active': content.active }" ng-repeat="(key, content) in buffers | toArray | filter:{fullName:search} | filter:hasUnread | orderBy:predicate">
<li class="buffer" ng-class="{'active': content.active, 'indent': content.indent }" ng-repeat="(key, content) in buffers | toArray | filter:{fullName:search} | filter:hasUnread | orderBy:predicate">
<a href="#" ng-click="setActiveBuffer(content.id)" title="{{ content.fullName }}">
<span class="badge pull-right" ng-hide="content.notification" ng-if="content.unread" ng-bind="content.unread"></span>
<span class="badge pull-right danger" ng-show="content.notification" ng-bind="content.notification"></span>
{{ content.indentedName(predicate) }}<span ng-hide="content.shortName">{{ content.fullName }}</span>
<span class="buffername">{{ content.shortName }}</span><span ng-hide="content.shortName">{{ content.fullName }}</span>
</a>
</li>
</ul>

12
js/models.js
View file

@ -27,15 +27,7 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
var unread = 0;
var lastSeen = -1;
var serverSortKey = fullName.replace(/^irc.server.(\w+)/, "irc.$1");
var indentedName = function(predicate) {
if( predicate == "serverSortKey" && fullName.match(/^irc./) && !fullName.match(/^irc.server./) ) {
// indent channel
return "    " + shortName; // four protected spaces
} else {
return shortName;
}
};
var indent = (fullName.match(/^irc./) && !fullName.match(/^irc.server./));
// Buffer opened message does not include notify level
if( message.notify !== undefined ) {
@ -173,7 +165,7 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
updateNick: updateNick,
flatNicklist: flatNicklist,
serverSortKey: serverSortKey,
indentedName: indentedName,
indent: indent,
history: history,
addToHistory: addToHistory,
getHistoryUp: getHistoryUp,