Modal for settings instead of dropdown
This commit is contained in:
Tor Hveem
David Cormier
parent
9dfcc06c41
commit
d21267289c
2 changed files with 102 additions and 74 deletions
|
|
@ -36,7 +36,7 @@ body {
|
||||||
box-shadow: rgba(255, 255, 255, 0.07) -1px 0 0;
|
box-shadow: rgba(255, 255, 255, 0.07) -1px 0 0;
|
||||||
border-left: 1px solid #121212;
|
border-left: 1px solid #121212;
|
||||||
}
|
}
|
||||||
.panel-group .panel-heading + .panel-collapse .panel-body {
|
.panel-group .panel-heading + .panel-collapse .panel-body, .modal-body, .modal-header, .modal-footer {
|
||||||
-webkit-box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0;
|
-webkit-box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0;
|
||||||
-moz-box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0;
|
-moz-box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0;
|
||||||
box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0;
|
box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0;
|
||||||
|
|
@ -165,7 +165,7 @@ input[type=text], input[type=password], .badge {
|
||||||
padding-right: 6px;
|
padding-right: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#topbar, #sidebar, .panel, .dropdown-menu {
|
#topbar, #sidebar, .panel, .dropdown-menu, .modal-content {
|
||||||
background: #282828;
|
background: #282828;
|
||||||
}
|
}
|
||||||
#sidebar {
|
#sidebar {
|
||||||
|
|
@ -333,6 +333,18 @@ table.notimestamp td.time {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal ul {
|
||||||
|
list-style: none;
|
||||||
|
padding-left: 15px;
|
||||||
|
}
|
||||||
|
.modal li {
|
||||||
|
font-size: larger;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
.modal-header {
|
||||||
|
border-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
/* Mobile layout */
|
/* Mobile layout */
|
||||||
/* */
|
/* */
|
||||||
|
|
|
||||||
160
index.html
160
index.html
|
|
@ -195,11 +195,90 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
|
||||||
</div>
|
</div>
|
||||||
<div class="title" ng-bind-html="activeBuffer().title | irclinky:'_blank'"></div>
|
<div class="title" ng-bind-html="activeBuffer().title | irclinky:'_blank'"></div>
|
||||||
<div class="actions pull-right vertical-line-left">
|
<div class="actions pull-right vertical-line-left">
|
||||||
<div class="dropdown pull-left">
|
<div class="pull-left">
|
||||||
<a class="dropdown-toggle" data-toggle="dropdown" title="Options menu">
|
<a class="" data-toggle="modal" data-target="#settingsModal" title="Options menu">
|
||||||
<i class="glyphicon glyphicon-cog"></i>
|
<i class="glyphicon glyphicon-cog"></i>
|
||||||
</a>
|
</a>
|
||||||
<ul class="dropdown-menu pull-right">
|
</div>
|
||||||
|
<a ng-click="disconnect()" title="Disconnect from WeeChat">
|
||||||
|
<i class="glyphicon glyphicon-remove"></i>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div bindonce id="sidebar" ng-show="showSidebar" ng-swipe-left="swipeSidebar()" class="vertical-line">
|
||||||
|
<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, 'indent': content.indent }" ng-repeat="(key, content) in (filteredBuffers = (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>
|
||||||
|
<span class="buffername">{{ content.shortName }}</span><span ng-hide="content.shortName">{{ content.fullName }}</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div bindonce id="bufferlines" class="monospace" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
|
||||||
|
<div id="nicklist" ng-show="showNicklist" ng-swipe-right="closeNick()" class="vertical-line-left">
|
||||||
|
<ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist">
|
||||||
|
<li ng-repeat="nick in group.nicks|orderBy:'name'" ng-click="openBuffer(nick.name)">
|
||||||
|
<a ng-click="nickAction(nick)"><span bo-class="nick.prefixClasses" bo-text="nick.prefix"></span><span bo-class="nick.nameClasses" bo-text="nick.name"></span></a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<table ng-swipe-right="swipeSidebar()" ng-swipe-left="openNick()" ng-class="{'notimestamp':notimestamp}">
|
||||||
|
<tbody>
|
||||||
|
<tr class="bufferline">
|
||||||
|
<td class="time"><span class="date"> </span></td>
|
||||||
|
<td class="prefix"> </td>
|
||||||
|
<td class="message">
|
||||||
|
<a class="fetchmorelines" ng-click="fetchMoreLines()" ng-hide="loadingLines">Fetch more lines</a>
|
||||||
|
<span ng-show="loadingLines">Fetching more lines...</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
<tbody ng-repeat="bufferline in (bufferlines = activeBuffer().lines)">
|
||||||
|
<tr class="bufferline">
|
||||||
|
<td class="time">
|
||||||
|
<span class="date" bo-class="{'repeated-time': bufferline.shortTime==bufferlines[$index-1].shortTime}">
|
||||||
|
<span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'HH'"></span><span class="cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters">:</span><span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'mm'"></span>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="prefix"><span ng-repeat="part in bufferline.prefix" bo-class="part.classes" bo-html="part.text"></span></td>
|
||||||
|
<td class="message">
|
||||||
|
<div ng-repeat="metadata in bufferline.metadata">
|
||||||
|
<div plugin data="metadata"></div>
|
||||||
|
</div>
|
||||||
|
<span ng-repeat="part in bufferline.content" class="text" bo-class="part.classes" bo-html="part.text|irclinky:'_blank'"></span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
|
||||||
|
<td colspan="3">
|
||||||
|
<hr id="readmarker">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div class="push"></div>
|
||||||
|
</div>
|
||||||
|
<div id="footer" ng-show="connected">
|
||||||
|
<div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
|
||||||
|
<div input-bar input-id="sendMessage"></div>
|
||||||
|
</div>
|
||||||
|
<div id="settingsModal" class="modal fade">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||||
|
<h4 class="modal-title">Settings</h4>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<p>Settings will be stored in your browser.</p>
|
||||||
|
<ul class="">
|
||||||
<li>
|
<li>
|
||||||
<form class="form-inline" role="form">
|
<form class="form-inline" role="form">
|
||||||
<div class="checkbox">
|
<div class="checkbox">
|
||||||
|
|
@ -282,74 +361,11 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<a ng-click="disconnect()" title="Disconnect from WeeChat">
|
<div class="modal-footer">
|
||||||
<i class="glyphicon glyphicon-remove"></i>
|
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
|
||||||
</a>
|
</div>
|
||||||
</div>
|
</div><!-- /.modal-content -->
|
||||||
</div>
|
</div><!-- /.modal-dialog -->
|
||||||
<div bindonce id="sidebar" ng-show="showSidebar" ng-swipe-left="swipeSidebar()" class="vertical-line">
|
</div><!-- /.modal -->
|
||||||
<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, 'indent': content.indent }" ng-repeat="(key, content) in (filteredBuffers = (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>
|
|
||||||
<span class="buffername">{{ content.shortName }}</span><span ng-hide="content.shortName">{{ content.fullName }}</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div bindonce id="bufferlines" class="monospace" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
|
|
||||||
<div id="nicklist" ng-if="showNicklist" ng-swipe-right="closeNick()" class="vertical-line-left">
|
|
||||||
<ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist">
|
|
||||||
<li ng-repeat="nick in group.nicks|orderBy:'name'" ng-click="openBuffer(nick.name)">
|
|
||||||
<a ng-click="nickAction(nick)"><span bo-class="nick.prefixClasses" bo-text="nick.prefix"></span><span bo-class="nick.nameClasses" bo-text="nick.name"></span></a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<table ng-swipe-right="swipeSidebar()" ng-swipe-left="openNick()" ng-class="{'notimestamp':notimestamp}">
|
|
||||||
<tbody>
|
|
||||||
<tr class="bufferline">
|
|
||||||
<td class="time"><span class="date"> </span></td>
|
|
||||||
<td class="prefix"> </td>
|
|
||||||
<td class="message">
|
|
||||||
<a class="fetchmorelines" ng-click="fetchMoreLines()" ng-hide="loadingLines">Fetch more lines</a>
|
|
||||||
<span ng-show="loadingLines">Fetching more lines...</span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
<tbody ng-repeat="bufferline in (bufferlines = activeBuffer().lines)">
|
|
||||||
<tr class="bufferline">
|
|
||||||
<td class="time">
|
|
||||||
<span class="date" bo-class="{'repeated-time': bufferline.shortTime==bufferlines[$index-1].shortTime}">
|
|
||||||
<span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'HH'"></span><span class="cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters">:</span><span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'mm'"></span>
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td class="prefix"><span ng-repeat="part in bufferline.prefix" bo-class="part.classes" bo-html="part.text"></span></td>
|
|
||||||
<td class="message">
|
|
||||||
<div ng-repeat="metadata in bufferline.metadata">
|
|
||||||
<div plugin data="metadata"></div>
|
|
||||||
</div>
|
|
||||||
<span ng-repeat="part in bufferline.content" class="text" bo-class="part.classes" bo-html="part.text|irclinky:'_blank'"></span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
|
|
||||||
<td colspan="3">
|
|
||||||
<hr id="readmarker">
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div class="push"></div>
|
|
||||||
</div>
|
|
||||||
<div id="footer" ng-show="connected">
|
|
||||||
<div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
|
|
||||||
<div input-bar input-id="sendMessage"></div>
|
|
||||||
</div>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue