diff --git a/web/zm_xhtml.php b/web/zm_xhtml.php index f7a65bca9..b1f9b3017 100644 --- a/web/zm_xhtml.php +++ b/web/zm_xhtml.php @@ -76,23 +76,23 @@ elseif ( !isset($view) ) switch( $view ) { - case "login" : - case "postlogin" : - case "logout" : case "console" : - case "state" : case "cycle" : - case "watch" : - case "montage" : - case "settings" : - case "events" : - case "filter" : case "event" : case "eventdetails" : + case "events" : + case "filter" : case "frame" : - case "monitor" : - case "video" : case "function" : + case "login" : + case "logout" : + case "monitor" : + case "montage" : + case "postlogin" : + case "settings" : + case "state" : + case "video" : + case "watch" : case "none" : { require_once( "zm_".$format."_view_".$view.".php" ); diff --git a/web/zm_xhtml_view_console.php b/web/zm_xhtml_view_console.php index 653fd4312..79bc81b51 100644 --- a/web/zm_xhtml_view_console.php +++ b/web/zm_xhtml_view_console.php @@ -65,7 +65,7 @@ while( $row = mysql_fetch_assoc( $result ) ) } mysql_free_result( $result ); ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangConsole ?> @@ -130,8 +130,8 @@ foreach( $monitors as $monitor )   1 ) ) ?> - - + + diff --git a/web/zm_xhtml_view_error.php b/web/zm_xhtml_view_error.php index 14c42a476..bdedabad0 100644 --- a/web/zm_xhtml_view_error.php +++ b/web/zm_xhtml_view_error.php @@ -19,15 +19,15 @@ // ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangError ?> - - - + + +
ZoneMinder
 

ZoneMinder
 

diff --git a/web/zm_xhtml_view_event.php b/web/zm_xhtml_view_event.php index 38300ecd3..e0ddb3d39 100644 --- a/web/zm_xhtml_view_event.php +++ b/web/zm_xhtml_view_event.php @@ -100,7 +100,7 @@ $frames_per_line = 3; $paged = $event['Frames'] > $frames_per_page; ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangEvent ?> - <?= $event['Name'] ?> @@ -108,8 +108,8 @@ $paged = $event['Frames'] > $frames_per_page; - - + +
  
2 ) { ?> -<< +<< -< +< - + - + - + -> +> ->> +>> -<?= $frame_id ?>/<?= $alarm_frame?$alarm_frame['Score']:0 ?> +<?= $frame_id ?>/<?= $alarm_frame?$alarm_frame['Score']:0 ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangEvent ?> <?= $eid ?> @@ -112,8 +112,8 @@ function getThumbnail( $event, $fid, $scale ) - - + +
1<?= $fid ?>1<?= $fid ?>
diff --git a/web/zm_xhtml_view_events.php b/web/zm_xhtml_view_events.php index 47d210eab..c9f269651 100644 --- a/web/zm_xhtml_view_events.php +++ b/web/zm_xhtml_view_events.php @@ -105,7 +105,7 @@ elseif ( !empty( $limit ) ) } ?> - +<?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangEvents ?> @@ -149,11 +149,11 @@ if ( !empty($limit) && $n_events > $limit ) if ( false && $page > 2 ) { ?> - + - + $limit ) foreach ( $new_pages as $new_page ) { ?> - + - + $limit ) foreach ( $new_pages as $new_page ) { ?> - + - + - + $limit ) { ?> - - - - - + + + + + > - + - - + + - +<?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangEventFilter ?> @@ -43,7 +43,7 @@ mysql_free_result( $result );
- +
<<<< << >> >>>>
^"; else echo "v"; ?>^"; else echo "v"; ?>^"; else echo "v"; ?>^"; else echo "v"; ?>^"; else echo "v"; ?>^"; else echo "v"; ?>^"; else echo "v"; ?>^"; else echo "v"; ?>^"; else echo "v"; ?>^"; else echo "v"; ?>
@@ -52,10 +52,10 @@ if ( count($filter_names) > 0 ) { ?> - + - + - + - +<?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangFrame ?> <?= $eid."-".$fid ?> @@ -79,31 +79,31 @@ $event_path = $image_data['eventPath'];
: : 
- +
- - + +
">
">
">
">
1 ) { ?> - + - + 1 ) { ?> - + - + - + - + - + - +
<<<<    <<    >>    >>>>   
diff --git a/web/zm_xhtml_view_function.php b/web/zm_xhtml_view_function.php index 64450e3f7..955ed9c18 100644 --- a/web/zm_xhtml_view_function.php +++ b/web/zm_xhtml_view_function.php @@ -30,7 +30,7 @@ $monitor = mysql_fetch_assoc( $result ); mysql_free_result( $result ); ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangFunction ?> - <?= $monitor['Name'] ?> @@ -46,25 +46,25 @@ mysql_free_result( $result ); - + - - + - +
  checked>  checked="checked"/>
diff --git a/web/zm_xhtml_view_login.php b/web/zm_xhtml_view_login.php index 97b66fbf1..5e6fe6aca 100644 --- a/web/zm_xhtml_view_login.php +++ b/web/zm_xhtml_view_login.php @@ -19,7 +19,7 @@ // ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangLogin ?> @@ -33,11 +33,11 @@ - - - - + + +
ZoneMinder +
ZoneMinder
" size="12"/>
" size="12"/>
diff --git a/web/zm_xhtml_view_montage.php b/web/zm_xhtml_view_montage.php index 194c2e143..38e44fd26 100644 --- a/web/zm_xhtml_view_montage.php +++ b/web/zm_xhtml_view_montage.php @@ -47,7 +47,7 @@ while( $row = mysql_fetch_assoc( $result ) ) mysql_free_result( $result ); ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangMontage ?> diff --git a/web/zm_xhtml_view_state.php b/web/zm_xhtml_view_state.php index b810f98c9..ac8e85c8f 100644 --- a/web/zm_xhtml_view_state.php +++ b/web/zm_xhtml_view_state.php @@ -35,7 +35,7 @@ while( $state = mysql_fetch_assoc( $result ) ) mysql_free_result( $result ); ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangState ?> @@ -53,7 +53,7 @@ mysql_free_result( $result ); ZoneMinder - - - + diff --git a/web/zm_xhtml_view_video.php b/web/zm_xhtml_view_video.php index 85d808f92..0cc2be733 100644 --- a/web/zm_xhtml_view_video.php +++ b/web/zm_xhtml_view_video.php @@ -134,7 +134,7 @@ if ( isset($download) ) } ?> - + <?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangVideo ?> - <?= $event['Name'] ?> @@ -151,10 +151,10 @@ if ( isset($download) ) - +
checked>
checked/>
- +
- - - - - + + + + + - - - - - + + + + + - +<?= ZM_WEB_TITLE_PREFIX ?> - <?= $monitor['Name'] ?> - <?= $zmSlangWatch ?> -

:  -  fps

-

<?= $monitor['Name'] ?>

+

:  -  fps

+

<?= $monitor['Name'] ?>

/
/