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

Better styles for nicklist, implement UI for hiding

Browse source
This commit is contained in:
Tor Hveem 2013-10-26 22:56:52 +02:00
parent 404f8c8cba
commit a06916f63e
4 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
css/glowingbear.css
View file

@ -175,10 +175,17 @@ input[type=text], input[type=password], .badge {
min-height: 100%; min-height: 100%;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden;
right: 0; right: 0;
top: 0; top: 0;
padding-top: 35px; /* topbar */ padding-top: 25px;
} padding-left: 5px;
padding-bottom: 35px;
}
#nicklist ul {
padding: 0;
margin: 0;
}
.nav-pills > li > a { .nav-pills > li > a {
border-radius: 0; border-radius: 0;
color: #ddd; color: #ddd;
@ -207,7 +214,7 @@ input[type=text], input[type=password], .badge {
} }
.navbar-fixed-bottom { .navbar-fixed-bottom {
margin: 0 5px 0 14%; margin: 0 105px 0 14%;
} }
.navbar-inverse { .navbar-inverse {
background-color: #181818; background-color: #181818;

28
index.html
View file

@ -146,7 +146,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
</div> </div>
</div> </div>
<div class="content" ng-show="connected"> <div class="content" ng-show="connected">
<div id="topbar" class="horizontal-line"> <div id="topbar" class="">
<div class="brand"> <div class="brand">
<img alt="brand" src="img/favicon.png"> <img alt="brand" src="img/favicon.png">
</div> </div>
@ -190,6 +190,16 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
</div> </div>
</form> </form>
</li> </li>
<li class="">
<form class="form-inline" role="form">
<div class="checkbox">
<label>
<input type="checkbox" ng-model="nonicklist">
Hide nicklist
</label>
</div>
</form>
</li>
</ul> </ul>
</div> </div>
<a ng-click="disconnect()"> <a ng-click="disconnect()">
@ -213,14 +223,14 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
</li> </li>
</ul> </ul>
</div> </div>
<div id="nicklist" class=""> <div id="bufferlines">
<ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist | toArray"> <div id="nicklist" ng-hide="nonicklist" class="vertical-line-left">
<li class="" ng-repeat="nick in group.nicks"> <ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist | toArray">
<a ng-click="nickAction(nick)"><span ng-class="nick.prefix_color">{{nick.prefix}}</span><span ng-class="color">{{nick.name}}</span></a> <li class="" ng-repeat="nick in group.nicks">
</li> <a ng-click="nickAction(nick)"><span ng-class="nick.prefix_color">{{nick.prefix}}</span><span ng-class="color">{{nick.name}}</span></a>
</ul> </li>
</div> </ul>
<div id="bufferlines" class="vertical-line"> </div>
<table> <table>
<tbody> <tbody>
<tr class="bufferline" ng-repeat-start="bufferline in (bufferlines = activeBuffer().lines)"> <tr class="bufferline" ng-repeat-start="bufferline in (bufferlines = activeBuffer().lines)">

2
js/models.js
View file

@ -144,7 +144,9 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
var prefix = message['prefix']; var prefix = message['prefix'];
var visible = message['visible']; var visible = message['visible'];
var name = message['name']; var name = message['name'];
/* TODO translate color to CSS value */
var prefix_color = message['prefix_color']; var prefix_color = message['prefix_color'];
/* TODO translate color to CSS value */
var color = message['color']; var color = message['color'];
return { return {

2
js/websockets.js
View file

@ -455,6 +455,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$store.bind($scope, "notimestamp", false); $store.bind($scope, "notimestamp", false);
// Save setting for syncing hotlist // Save setting for syncing hotlist
$store.bind($scope, "hotlistsync", true); $store.bind($scope, "hotlistsync", true);
// Save setting for displaying nicklist
$store.bind($scope, "nonicklist", false);
$scope.setActiveBuffer = function(key) { $scope.setActiveBuffer = function(key) {