Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

smarter mobile detection (fix #255 and fix #487)

Browse Source
This commit is contained in:
Athou
2013-11-08 11:09:13 +01:00
parent 73323335cb
commit fc318ad211
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/templates/_subscribe.html
View File

@@ -12,7 +12,7 @@
</div>
<div class="btn-group">
<button type="button" class="btn hidden-desktop" ng-click="MobileService.toggleLeftMenu()">
<button type="button" class="btn" ng-click="MobileService.toggleLeftMenu()" ng-if="MobileService.mobile">
<i class="icon-remove"></i> ${global.close}
</button>
</div>

10
src/main/webapp/templates/_toolbar.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="ToolbarCtrl">
<div class="form-horizontal">
<div class="btn-group hidden-desktop">
<div class="btn-group" ng-if="MobileService.mobile">
<button type="button" class="btn" ng-click="MobileService.toggleLeftMenu()">
<i class="icon-list-alt"></i>
</button>
@@ -33,14 +33,14 @@
</ul>
</div>
<div class="btn-group hidden-desktop">
<div class="btn-group toolbar-expand" ng-if="MobileService.mobile">
<button type="button" class="btn" ng-click="MobileService.toggleRightMenu()">
<i ng-class="{'icon-double-angle-right' : !MobileService.rightMenu, 'icon-double-angle-left': MobileService.rightMenu}"></i>
</button>
</div>
<div class="actions btn-group">
<div class="visible-desktop">
<div ng-if="!MobileService.mobile || MobileService.rightMenu">
<div class="btn-group read-mode" data-toggle="buttons-radio">
<button type="button" class="btn" ng-model="settingsService.settings.readingMode" btn-radio="'unread'">${toolbar.unread}</button>
<button type="button" class="btn" ng-model="settingsService.settings.readingMode" btn-radio="'all'">${toolbar.all}</button>
@@ -69,7 +69,7 @@
<li><a href="logout"><i class="icon-off"></i> ${toolbar.logout}</a></li>
</ul>
</div>
<form ng-submit="search()" class="btn-group input-append hidden-phone hidden-tablet">
<form ng-submit="search()" class="btn-group input-append" ng-if="!MobileService.mobile">
<input type="text" ng-model="keywords"></input>
<button class="btn" type="submit"><i class="icon-search"></i></button>
</form>
@@ -82,6 +82,6 @@
</div>
</div>
<div spinner shown="loading"></div>
<span class="hidden-phone hidden-tablet" ng-bind-html-unsafe="ServerService.announcement"></span>
<span ng-if="!MobileService.mobile" ng-bind-html-unsafe="ServerService.announcement"></span>
</div>
</div>