diff --git a/apps/apps/urls.py b/apps/apps/urls.py deleted file mode 100644 index 2d6afd518..000000000 --- a/apps/apps/urls.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# - -from django.conf.urls import url - -import views -import api - -app_name = 'apps' - -urlpatterns = [ - url(r'^apps$', views.TerminalListView.as_view(), name='apps-list'), -] - -urlpatterns += [ - url(r'^v1/apps/$', api.TerminalApi.as_view(), name='apps-list-create-api'), -] diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 28c8b7820..d81880e7b 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -57,7 +57,7 @@ INSTALLED_APPS = [ 'ops.apps.OpsConfig', 'audits.apps.AuditsConfig', 'common.apps.CommonConfig', - 'apps.apps.TerminalConfig', + 'terminal.apps.TerminalConfig', 'rest_framework', 'rest_framework.authtoken', 'bootstrapform', @@ -270,7 +270,7 @@ REST_FRAMEWORK = { 'rest_framework.authentication.BasicAuthentication', 'rest_framework.authentication.SessionAuthentication', 'rest_framework.authentication.TokenAuthentication', - 'users.backends.AppSignAuthentication', + 'users.backends.TerminalAuthentication', ), } # This setting is required to override the Django's main loop, when running in diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index 912b3c5e3..ba7611e2f 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -26,7 +26,7 @@ urlpatterns = [ url(r'^assets/', include('assets.urls')), url(r'^perms/', include('perms.urls')), url(r'^(api/)?audits/', include('audits.urls')), - url(r'^(api/)?apps/', include('apps.urls')), + url(r'^(api/)?terminal/', include('terminal.urls')), ] diff --git a/apps/static/js/plugins/highcharts/highcharts.src.js b/apps/static/js/plugins/highcharts/highcharts.src.js index 381650b0d..1bb0a4bc7 100644 --- a/apps/static/js/plugins/highcharts/highcharts.src.js +++ b/apps/static/js/plugins/highcharts/highcharts.src.js @@ -4447,7 +4447,7 @@ extend(SVGRenderer.prototype, { * START OF INTERNET EXPLORER <= 8 SPECIFIC CODE * * * * For applications and websites that don't need IE support, like platform * - * targeted mobile apps and web apps, this code can be removed. * + * targeted mobile terminal and web terminal, this code can be removed. * * * *****************************************************************************/ diff --git a/apps/static/js/record.js b/apps/static/js/record.js index ad24c4ab0..ba334e0c2 100644 --- a/apps/static/js/record.js +++ b/apps/static/js/record.js @@ -121,7 +121,7 @@ NgApp.controller('TerminalRecordCtrl', function ($scope, $http) { timelist = timelist.sort(function(a, b){return a-b}); totalTime = totalTime * 1000; document.getElementById("afterScrubberText").innerHTML = buildTimeString(totalTime); - term.open(document.getElementById('apps')); + term.open(document.getElementById('terminal')); timer = setInterval(advance, TICK); }) diff --git a/apps/static/js/term.js b/apps/static/js/term.js index 45850da2e..beb326f14 100644 --- a/apps/static/js/term.js +++ b/apps/static/js/term.js @@ -588,7 +588,7 @@ Terminal.bindKeys = function(document) { }, true); // If we click somewhere other than a - // apps, unfocus the apps. + // terminal, unfocus the terminal. on(document, 'mousedown', function(ev) { if (!Terminal.focus) return; @@ -742,7 +742,7 @@ Terminal.insertStyle = function(document, bg, fg) { // textContent doesn't work well with IE for