From a4c5f83c8c6f9e5660727b325c1a19029cf580e5 Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Tue, 3 Mar 2015 08:00:24 -0500 Subject: [PATCH] Migrate Log view to ui-router --- web/js/app.js | 5 +++++ web/views/header.html | 2 +- web/views/{log.php => log.html} | 27 +++++++++------------------ 3 files changed, 15 insertions(+), 19 deletions(-) rename web/views/{log.php => log.html} (83%) diff --git a/web/js/app.js b/web/js/app.js index 7d19b37a8..fd23a7ce5 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -88,6 +88,11 @@ ZoneMinder.config(function($stateProvider, $urlRouterProvider) { templateUrl: '/views/host.html' }) + .state('log', { + url: '/log', + templateUrl: '/views/log.html' + }) + /////////////////////////// // Zones - Edit and List // /////////////////////////// diff --git a/web/views/header.html b/web/views/header.html index c90760edf..6023f719e 100644 --- a/web/views/header.html +++ b/web/views/header.html @@ -17,7 +17,7 @@
  • Events
  • Timeline
  • Options
    • -
  • Logs
    • +
  • Logs
  • Devices
  • Host
  • diff --git a/web/views/log.php b/web/views/log.html similarity index 83% rename from web/views/log.php rename to web/views/log.html index a307ab3e8..a2c10f117 100644 --- a/web/views/log.php +++ b/web/views/log.html @@ -1,17 +1,11 @@ - - - - - -
    -
    +
    +
    - -
    +
    - +
    @@ -34,11 +28,10 @@
    +
    +
    -
    -
    - -
    +
    @@ -61,9 +54,7 @@
    {{ log.Log.Line }}
    +
    -
    -
    +
    - -