ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/zoneminder

pull/2719/head
Isaac Connor 2019-10-02 16:41:20 -04:00
parent 7b93a445b8 b4d5d92d86
commit 6b65e9a60c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/includes/Group.php
View File

@ -76,7 +76,7 @@ class Group extends ZM_Object {
public static function get_dropdown_options() {
$Groups = array();
foreach ( Group::find( ) as $Group ) {
foreach ( Group::find(array(), array('order'=>'lower(Name)')) as $Group ) {
$Groups[$Group->Id()] = $Group;
}

4
web/skins/classic/views/monitor.php
View File

@ -868,13 +868,17 @@ if ( $monitor->Type() != 'NVSocket' && $monitor->Type() != 'WebSite' ) {
<?php echo htmlselect('dimensions_select', array(
''=>translate('Custom'),
'176x120'=>'176x120 QCIF',
'176x144'=>'176x14',
'320x240'=>'320x240',
'320x200'=>'320x200',
'352x240'=>'352x240 CIF',
'640x480'=>'640x480',
'640x400'=>'640x400',
'704x240'=>'704x240 2CIF',
'704x480'=>'704x480 4CIF',
'720x480'=>'720x480 D1',
'1280x720'=>'1280x720 720p',
'1280x800'=>'1280x800',
'1280x960'=>'1280x960 960p',
'1280x1024'=>'1280x1024 1MP',
'1600x1200'=>'1600x1200 2MP',