From 1fad2d7ec97600fd099d423aafd0ec9f165f3b4d Mon Sep 17 00:00:00 2001 From: stan Date: Fri, 16 Oct 2009 17:09:16 +0000 Subject: [PATCH] Changed query separator to & and miscellaneous html fixes. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f --- web/skins/classic/views/console.php | 24 ++++++++++++------------ web/skins/classic/views/controlcaps.php | 2 +- web/skins/classic/views/cycle.php | 4 ++-- web/skins/classic/views/devices.php | 5 +++-- web/skins/classic/views/event.php | 3 +-- web/skins/classic/views/eventdetail.php | 4 ++-- web/skins/classic/views/events.php | 24 ++++++++++++------------ web/skins/classic/views/filtersave.php | 6 +++--- web/skins/classic/views/frame.php | 14 +++++++------- web/skins/classic/views/frames.php | 4 ++-- web/skins/classic/views/function.php | 2 +- web/skins/classic/views/logout.php | 4 ++-- web/skins/classic/views/monitor.php | 4 ++-- web/skins/classic/views/montage.php | 2 +- web/skins/classic/views/options.php | 8 ++++---- web/skins/classic/views/state.php | 2 +- web/skins/classic/views/timeline.php | 6 +++--- web/skins/classic/views/video.php | 2 +- web/skins/classic/views/watch.php | 4 ++-- web/skins/classic/views/zones.php | 6 +++--- 20 files changed, 65 insertions(+), 65 deletions(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 9ab709ad0..9856e561c 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -207,7 +207,7 @@ if ( canView( 'Stream' ) && $cycleCount > 1 ) { $cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0; ?> -
 / 
+
 / 
- + - + @@ -300,16 +300,16 @@ foreach( $displayMonitors as $monitor ) $fclass .= " disabledText"; $scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); ?> - - '.$monitor['Function'].'', canEdit( 'Monitors' ) ) ?> + + '.$monitor['Function'].'', canEdit( 'Monitors' ) ) ?> - '.$monitor['Device'].' ('.$monitor['Channel'].')', canEdit( 'Monitors' ) ) ?> + '.$monitor['Device'].' ('.$monitor['Channel'].')', canEdit( 'Monitors' ) ) ?> - '.preg_replace( '/^.*@/', '', $monitor['Host'] ).'', canEdit( 'Monitors' ) ) ?> + '.preg_replace( '/^.*@/', '', $monitor['Host'] ).'', canEdit( 'Monitors' ) ) ?> - '.preg_replace( '/^.*\//', '', $monitor['Path'] ).'', canEdit( 'Monitors' ) ) ?> + '.preg_replace( '/^.*\//', '', $monitor['Path'] ).'', canEdit( 'Monitors' ) ) ?> - '.preg_replace( '/^.*\//', '', $monitor['Path'] ).'', canEdit( 'Monitors' ) ) ?> + '.preg_replace( '/^.*\//', '', $monitor['Path'] ).'', canEdit( 'Monitors' ) ) ?>   @@ -317,16 +317,16 @@ foreach( $displayMonitors as $monitor ) for ( $i = 0; $i < count($eventCounts); $i++ ) { ?> - + - + - ', $monitor['Sequence']>$minSequence ) ?>', $monitor['Sequence']<$maxSequence ) ?> + ', $monitor['Sequence']>$minSequence ) ?>', $monitor['Sequence']<$maxSequence ) ?> diff --git a/web/skins/classic/views/controlcaps.php b/web/skins/classic/views/controlcaps.php index 2375f89a1..0a737a3f5 100644 --- a/web/skins/classic/views/controlcaps.php +++ b/web/skins/classic/views/controlcaps.php @@ -64,7 +64,7 @@ foreach( $controls as $control ) { ?> - + diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php index 312db5fbc..8d659dec2 100644 --- a/web/skins/classic/views/cycle.php +++ b/web/skins/classic/views/cycle.php @@ -95,9 +95,9 @@ xhtmlHeaders(__FILE__, $SLANG['CycleWatch'] ); diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php index d120d2391..08ebdd4e3 100644 --- a/web/skins/classic/views/event.php +++ b/web/skins/classic/views/event.php @@ -208,8 +208,7 @@ else
-
-
+
diff --git a/web/skins/classic/views/eventdetail.php b/web/skins/classic/views/eventdetail.php index 53aa5565e..437b95f98 100644 --- a/web/skins/classic/views/eventdetail.php +++ b/web/skins/classic/views/eventdetail.php @@ -115,11 +115,11 @@ elseif ( $mode = 'multi' ) - - diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index 69aa2de9e..ca08fb0f0 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -117,7 +117,7 @@ foreach ( dbFetchAll( $eventsSql ) as $event ) } $maxShortcuts = 5; -$pagination = getPagination( $pages, $page, $maxShortcuts, $filterQuery.$sortQuery.'&limit='.$limit ); +$pagination = getPagination( $pages, $page, $maxShortcuts, $filterQuery.$sortQuery.'&limit='.$limit ); $focusWindow = true; @@ -134,13 +134,13 @@ if ( $pages > 1 ) if ( !empty($page) ) { ?> - + - +

- +

-
+
+
+
- - + + - + - - + + - + - + "/>

- +

- +

- checked="checked"/> + checked="checked"/>

disabled="disabled"/> diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php index c8ac13def..efbf04693 100644 --- a/web/skins/classic/views/frame.php +++ b/web/skins/classic/views/frame.php @@ -71,23 +71,23 @@ xhtmlHeaders(__FILE__, $SLANG['Frame']." - ".$event['Id']." - ".$frame['FrameId'
-

">

+

">Frame <?= $frame['FrameId'] ?>

1 ) { ?> - + 1 ) { ?> - + - + - +

diff --git a/web/skins/classic/views/frames.php b/web/skins/classic/views/frames.php index ad145677d..8b4bb0220 100644 --- a/web/skins/classic/views/frames.php +++ b/web/skins/classic/views/frames.php @@ -61,7 +61,7 @@ if ( count($frames) ) $class = strtolower($frame['Type']); ?>
- + @@ -69,7 +69,7 @@ if ( count($frames) ) if ( ZM_RECORD_EVENT_STATS && ($frame['Type'] == 'Alarm') ) { ?> - + - checked="checked"/> + checked="checked"/>

diff --git a/web/skins/classic/views/logout.php b/web/skins/classic/views/logout.php index 8c1817ece..7b8f87479 100644 --- a/web/skins/classic/views/logout.php +++ b/web/skins/classic/views/logout.php @@ -38,11 +38,11 @@ xhtmlHeaders(__FILE__, $SLANG['Logout'] ); if ( ZM_USER_SELF_EDIT ) { ?> - + -

+

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index d283d8cb3..d7b3b4f67 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -364,8 +364,8 @@ if ( canEdit( 'Monitors' ) ) { ?>
- - + +
-
+
$value ) else { ?> -
    • +
    • - + @@ -143,7 +143,7 @@ if ( $tab == "users" )
    ' ) ?>' ) ?>
    - disabled="disabled"/> + disabled="disabled"/>
    -  () +  () - + diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php index 69cc49477..5871e2b05 100644 --- a/web/skins/classic/views/timeline.php +++ b/web/skins/classic/views/timeline.php @@ -268,7 +268,7 @@ if ( $tree ) $filterQuery = parseTreeToQuery( $tree ); if ( $filterQuery ) { - $filterQuery = '&'.$filterQuery; + $filterQuery = '&'.$filterQuery; } } else @@ -808,7 +808,7 @@ xhtmlHeaders(__FILE__, $SLANG['Timeline'] );