diff options
Diffstat (limited to 'www')
| -rwxr-xr-x | www/js/app.js | 2 | ||||
| -rw-r--r-- | www/templates/montage.html | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/www/js/app.js b/www/js/app.js index 95200bc8..3dde24f1 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1525,7 +1525,7 @@ angular.module('zmApp', [ event.preventDefault(); return; - }; + } var requireLogin = toState.data.requireLogin; diff --git a/www/templates/montage.html b/www/templates/montage.html index 78ccb87f..360e4a4a 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -238,14 +238,19 @@ <div ng-show="minimal"> <nav mfb-menu position="bl" effect="zoomin" label="{{'kCollapse' | translate}}" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> - <button ng-if="!$root.LoginData.isKiosk" mfb-button icon="ion-arrow-expand" label="{{'kIncreaseSize' | translate}}" ng-click="sliderChanged(1)"> + <button ng-if="!$root.LoginData.isKiosk" mfb-button icon="ion-plus" label="{{'kIncreaseSize' | translate}}" ng-click="sliderChanged(1)"> </button> - <button ng-if="!$root.LoginData.isKiosk" mfb-button icon="ion-arrow-shrink" label="{{'kDecreaseSize' | translate}}" ng-click="sliderChanged(-1)"> + <button ng-if="!$root.LoginData.isKiosk" mfb-button icon="ion-minus" label="{{'kDecreaseSize' | translate}}" ng-click="sliderChanged(-1)"> </button> <!-- <button mfb-button icon="ion-refresh" label="{{'kRefresh' | translate}}" ng-click="resetSizes();"> </button>--> - <button mfb-button icon="ion-android-apps" label="{{'kReflow'| translate}}" ng-click="squeezeMonitors()"> + + <button mfb-button icon="ion-arrow-shrink" label="{{'kReflow'| translate}}" ng-click="squeezeMonitors()"> </button> + <!-- + <button mfb-button icon="ion-grid" label="{{'kArrange'| translate}}" ng-click="resetSizesWithInput()"> + </button> + --> <button mfb-button icon="ion-close" label="{{'kExitFullScreen'| translate}}" ng-click="switchMinimal()"> </button> |