diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 3 | ||||
| -rw-r--r-- | www/templates/log.html | 4 | ||||
| -rw-r--r-- | www/templates/menu.html | 2 | ||||
| -rw-r--r-- | www/templates/monitors.html | 2 | ||||
| -rw-r--r-- | www/templates/state.html | 3 | ||||
| -rw-r--r-- | www/templates/wizard.html | 6 |
6 files changed, 11 insertions, 9 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index b58e2711..29b6004e 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -45,7 +45,8 @@ <div ng-if="defaultVideo!==undefined && defaultVideo!='' && !isSnapShot()"> <div ng-if="videoIsReady"> - <div style="height:{{$root.devHeight}}px; width:{{$root.devWidth}}px;"> + <!--<div style="height:{{$root.devHeight}}px; width:{{$root.devWidth}}px;">--> + <div ng-style="{'height':$root.devHeight+'px', 'width':$root.devWidth+'px'}" <!-- diff --git a/www/templates/log.html b/www/templates/log.html index c664901d..5b4ff864 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -7,10 +7,10 @@ <a class="button button-icon icon ion-arrow-swap" ng-href="" ng-click="flipLogs()"></a> <a ng-if="logEntity == $root.appName" class="button button-icon icon ion-trash-a" ng-href="" ng-click="deleteLogs()"></a> <div ng-if="$root.platformOS!='desktop'"> - <a style="" class="button button-icon icon ion-email" ng-href="" ng-click="sendEmail(log.logString)"> </a> + <a class="button button-icon icon ion-email" ng-href="" ng-click="sendEmail(log.logString)"> </a> </div> <div ng-if="$root.platformOS=='desktop'"> - <a style="" class="button button-icon icon ion-android-download" ng-href="" ng-click="sendEmail(log.logString)"> </a> + <a class="button button-icon icon ion-android-download" ng-href="" ng-click="sendEmail(log.logString)"> </a> </div> </ion-nav-buttons> <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> diff --git a/www/templates/menu.html b/www/templates/menu.html index 3337673f..838fe941 100644 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -65,7 +65,7 @@ <!--<span class="item-note" style="width:90px"> {{$root.getProfileName();}} </span>--> - <span style="float:right; margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;display:inline-block;text-align:center;"> {{$root.getProfileName();}} </span> + <span style="float:right; margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;text-align:center;"> {{$root.getProfileName();}} </span> </span> </ion-item> <ion-item nav-clear menu-close ng-click="navigateView('app.devoptions')"> diff --git a/www/templates/monitors.html b/www/templates/monitors.html index 9bd2d5fa..dbde85cf 100644 --- a/www/templates/monitors.html +++ b/www/templates/monitors.html @@ -25,7 +25,7 @@ <b>{{monitor.Monitor.Name}}</b> </span> <span class="item-icon-right"> - <i class="icon {{monitor.Monitor.char}}" style="color:{{monitor.Monitor.color}};"></i> + <i class="icon {{monitor.Monitor.char}}" ng-style="{'color':monitor.Monitor.color}"></i> </span> <!-- <i ng-class="{'icon ion-eye':monitor.Monitor.listDisplay=='show','icon ion-eye-disabled':monitor.Monitor.listDisplay!='show'}"> </i>--> </div> diff --git a/www/templates/state.html b/www/templates/state.html index 33df994e..e5ad16d1 100644 --- a/www/templates/state.html +++ b/www/templates/state.html @@ -14,7 +14,8 @@ <div class="col"> ZoneMinder: </div> - <div class="col" style="text-align:right; {{color}}"> + + <div class="col" ng-style="{'text-align':'right','color':color}"> {{zmRun}} <p>{{customState}}</p> </div> diff --git a/www/templates/wizard.html b/www/templates/wizard.html index 70f17b6e..872dc7fb 100644 --- a/www/templates/wizard.html +++ b/www/templates/wizard.html @@ -66,9 +66,9 @@ <br/> <br/> <h4>{{'kWizResults' | translate}}</h4> - <span ng-if="wizard.portalValidText" style="color:{{wizard.portalColor}};"><i ng-class="wizard.portalColor=='#16a085' ? 'ion-checkmark-circled':'ion-close-circled'"></i> {{wizard.portalValidText}}<br/></span> - <span ng-if="wizard.apiValidText" style="color:{{wizard.apiColor}};"><i ng-class=" wizard.apiColor=='#16a085' ? 'ion-checkmark-circled':'ion-close-circled'"></i> {{wizard.apiValidText}}<br/></span> - <span ng-if="wizard.streamingValidText" style="color:{{wizard.streamingColor}};"><i ng-class="wizard.streamingColor=='#16a085' ? 'ion-checkmark-circled':'ion-close-circled'"></i> {{wizard.streamingValidText}}<br/></span> + <span ng-if="wizard.portalValidText" ng-style="{'color':wizard.portalColor}"><i ng-class="wizard.portalColor=='#16a085' ? 'ion-checkmark-circled':'ion-close-circled'"></i> {{wizard.portalValidText}}<br/></span> + <span ng-if="wizard.apiValidText" ng-style="{'color':wizard.apiColor}"><i ng-class=" wizard.apiColor=='#16a085' ? 'ion-checkmark-circled':'ion-close-circled'"></i> {{wizard.apiValidText}}<br/></span> + <span ng-if="wizard.streamingValidText" ng-style="{'color':wizard.streamingColor}"><i ng-class="wizard.streamingColor=='#16a085' ? 'ion-checkmark-circled':'ion-close-circled'"></i> {{wizard.streamingValidText}}<br/></span> <br/> <div class="wizardtip"> {{'kWizNextStep1' | translate}}: |