Index: /branches/amp_3_7/extensions/auditing/metadata.json =================================================================== --- /branches/amp_3_7/extensions/auditing/metadata.json (revision 2492) +++ /branches/amp_3_7/extensions/auditing/metadata.json (working copy) @@ -1,51 +1,67 @@ { + "name": "auditing", + "verbose_name": "Auditing", + "has_webui": true, + "webui_sidebar": { + "show": true, "name": "auditing", - "verbose_name": "Auditing", - "has_webui": true, - "webui_sidebar": { + "title": "Auditing", + "auth_path": [ + "auditing" + ], + "elements": [ + { "show": true, - "name": "auditing", - "title": "Auditing", - "auth_path": ["auditing"], - "elements": [{ - "show": true, - "icon": "fa fa-newspaper-o", - "name": "log_analysis", - "verbose_name": "Log Analysis", - "auth_path": ["auditing", "log_analysis"], - "ui_url": "auditing.log_analysis.slb_service", - "url_prefix": "/auditing/log_analysis", - "ui_data": {}, - "collapse": true, - "submenu": { - "state": true, - "list": [ - { - "title": "SLB Service", - "auth_path": ["auditing", "log_analysis"], - "sub_ui_url": "auditing.log_analysis.slb_service", - "sub_url_prefix": "/auditing/log_analysis/slb_service" - }, - { - "title": "SSLVPN Service", - "auth_path": ["auditing", "log_analysis"], - "sub_ui_url": "auditing.log_analysis.sslvpn_service.user", - "sub_url_prefix": "/auditing/log_analysis/sslvpn_service" - } - ] + "icon": "fa fa-newspaper-o", + "name": "log_analysis", + "verbose_name": "Log Analysis", + "auth_path": [ + "auditing", + "log_analysis" + ], + "ui_url": "auditing.log_analysis.slb_service", + "url_prefix": "/auditing/log_analysis", + "ui_data": {}, + "collapse": true, + "submenu": { + "state": true, + "list": [ + { + "title": "SLB Service", + "auth_path": [ + "auditing", + "log_analysis" + ], + "sub_ui_url": "auditing.log_analysis.slb_service", + "sub_url_prefix": "/auditing/log_analysis/slb_service" }, - "isExpanded": true + { + "title": "SSLVPN Service", + "auth_path": [ + "auditing", + "log_analysis" + ], + "sub_ui_url": "auditing.log_analysis.sslvpn_service.user", + "sub_url_prefix": "/auditing/log_analysis/sslvpn_service" + } + ] }, - { - "show": true, - "icon": "fa fa-heartbeat", - "name": "audit_engine", - "verbose_name": "Auditing Engine", - "ui_url": "auditing.engine.kibana", - "url_prefix": "/auditing/engine", - "ui_data": {}, - "isExpanded": true, - "auth_path": ["auditing", "engine"] - }] - } + "isExpanded": true + }, + { + "show": true, + "icon": "fa fa-heartbeat", + "name": "observability", + "verbose_name": "Observability", + "ui_url": "auditing.engine.kibana", + "url_prefix": "/auditing/engine/kibana", + "ui_data": {}, + "isExpanded": true, + "auth_path": [ + "auditing", + "engine" + ] + } + ] + } } Index: /branches/amp_3_7/extensions/auditing/webui/engine/acquisition/acquisition.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/engine/acquisition/acquisition.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/engine/acquisition/acquisition.html (working copy) @@ -1,41 +1,56 @@ -
-
- {{'Running Status' | T}} -
-
-
-
- -
- - - +
+
+
+ {{'Running Status' | T}} +
+
+ +
+ +
+ + + +
-
- -
-
-
-
- {{'Running Configuration' | T}} + +
-
-
-
- -
- +
+
+ {{'Running Configuration' | T}} +
+
+ +
+ +
+ +
-
-
-
- - +
+
+ + +
-
- + +
\ No newline at end of file Index: /branches/amp_3_7/extensions/auditing/webui/engine/elastic/elastic.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/engine/elastic/elastic.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/engine/elastic/elastic.html (working copy) @@ -1,17 +1,22 @@ -
-
- {{'Running Status' | T}} -
-
-
-
- -
- - - +
+
+
+ {{'Running Status' | T}} +
+
+ +
+ +
+ + + +
-
- + +
\ No newline at end of file Index: /branches/amp_3_7/extensions/auditing/webui/engine/engine.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/engine/engine.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/engine/engine.html (working copy) @@ -2,19 +2,20 @@
+
+
+
+
+
-
-
-
-
-
\ No newline at end of file Index: /branches/amp_3_7/extensions/auditing/webui/engine/kibana/kibana.controller.js =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/engine/kibana/kibana.controller.js (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/engine/kibana/kibana.controller.js (working copy) @@ -25,6 +25,12 @@ kibanaViewModel.status_info = res.data; } }); + engineService.getStatus('elastic').then(function (res) { + kibanaViewModel.loading = false; + if (res && res.status === 200) { + kibanaViewModel.elastic_status_info = res.data; + } + }); } kibanaViewModel.refresh_status(); Index: /branches/amp_3_7/extensions/auditing/webui/engine/kibana/kibana.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/engine/kibana/kibana.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/engine/kibana/kibana.html (working copy) @@ -1,46 +1,47 @@ -
-
- {{'Running Status' | T}} -
-
-
-
- -
- - - +
+
+
+ {{'Observability' | T}} +
+
+ +
+ +
+ Kibana +
-
-
- -
- Kibana +
+

There was an issue with the Kibana service. Please try again in a few moments.

-
- + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
-
-
- {{'Running Configuration' | T}} -
-
-
-
- -
- -
-
-
-
- - -
-
-
-
-
\ No newline at end of file Index: /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/slb.detail.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/slb.detail.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/slb.detail.html (working copy) @@ -1,17 +1,16 @@ -
+
- -
+
Index: /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/slb.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/slb.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/slb.html (working copy) @@ -1,98 +1,115 @@ -
-
- {{'SLB Service' | T}} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
No.{{ 'Service Name' | T }}{{ 'Type' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'IP Address' | T }}
- - - - - - - -
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }} - {{ item.name }} - {{ item.type }} {{ item.device.name }}{{ item.device.device_group }}{{ item.ip }}
{{'Loading...' | T }}
-
-
+
+
+
+
+ {{'SLB Service' | T}} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No.{{ 'Service Name' | T }}{{ 'Type' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'IP Address' | T }}
+ + + + + + + +
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }} + {{ item.name }} + {{ item.type }}{{ item.device.name }}{{ item.device.device_group }}{{ item.ip }}
No matching records found.
{{'Loading...' | T }}
+
+
+
+
- Index: /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/visitLog.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/visitLog.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/log_analysis/slb_service/slb/visitLog.html (working copy) @@ -1,118 +1,127 @@ -
-
-
-
- -
- -
+
+ +
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
-
-

{{'Example for Filter :' | T}}

-

{{'response_code=200(200/400/401/403/404/500/504...)' | T}}

-

{{'method=GET(GET/POST/PUT...)' | T}}

-

{{'srcip=10.1.1.1' | T}} -

{{'dstip=10.10.10.0' | T}}

-

{{'method=GET&response_code=200' | T}}

-

{{'srcip=10.1.1.1&dstip=10.10.10.0' | T}}

-
+
+
+
+

{{'Example for Filter :' | T}}

+

+ {{'response_code=200(200/400/401/403/404/500/504...)' | T}} +

+

{{'method=GET(GET/POST/PUT...)' | T}}

+

{{'srcip=10.1.1.1' | T}} +

{{'dstip=10.10.10.0' | T}}

+

+ {{'method=GET&response_code=200' | T}} +

+

+ {{'srcip=10.1.1.1&dstip=10.10.10.0' | T}} +

- -
+
+
-
-
-
-

{{ 'Total 0 Records' | T}}

-
-
-
- {{ widget.title | T}} -
-
+ +
+
+
{{ 'Total 0 Records' | T}}
+
+
+
+ {{ widget.title | T}}
+
-
-
-
-
- {{ 'Access Logs' | T }} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
No.{{ 'Time' | T }}{{ 'Src IP' | T }}{{ 'User Agent' | T }}{{ 'Request' | T }}{{ 'Server IP' | T }}{{'Status' | T}}{{'RTT' | T}}
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.timestamp }}{{ item.src }}{{ item.useragent}}{{ item.httpmethod}}{{ item.serverip }}{{ item.httpstatuscode }}{{ item.duration ? item.duration : 0 | number:2}}s
{{'Loading...' | T }}
-
-
-
+ +
+
+
+ {{ 'Access Logs' | T }} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No.{{ 'Time' | T }}{{ 'Src IP' | T }}{{ 'User Agent' | T }}{{ 'Request' | T }}{{ 'Server IP' | T }}{{'Status' | T}}{{'RTT' | T}}
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.timestamp }}{{ item.src }}{{ item.useragent}}{{ item.httpmethod}}{{ item.serverip }}{{ item.httpstatuscode }}{{ item.duration ? item.duration : 0 | number:2}}s
{{'Loading...' | T }}
+
+
\ No newline at end of file Index: /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/audit.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/audit.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/audit.html (working copy) @@ -2,19 +2,24 @@
-
-
-
-
-
+
+
+
+
+
Index: /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/device/deviceList.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/device/deviceList.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/device/deviceList.html (working copy) @@ -1,82 +1,102 @@ -
-
- - {{item.verbose_name}} - - − - +
+ -
-
-
-
-
- - - -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
No.{{ 'Endpoint ID' | T }}{{ 'User' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'Vsite Name' | T }}
- - - - - - - - - -
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ user.hardware_id }}{{ user.user_name }}{{ user.device.name }}{{ user.device.device_group }}{{ user.vsite_name }}
+ {{item.verbose_name}} + + − + +
+
+
+
+
+
+ + +
-
- +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No.{{ 'Endpoint ID' | T }}{{ 'User' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'Vsite Name' | T }}
+ + + + + + + + + +
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ user.hardware_id }}{{ user.user_name }}{{ user.device.name }}{{ user.device.device_group }}{{ user.vsite_name }}
No matching records found.
+
+
@@ -85,7 +105,7 @@ cursor: pointer; background: #D9DEE4; color: #666666; - padding: 0px 10px; + padding: 0 10px; margin-right: 7px; display: inline-block; vertical-align: -2px; @@ -102,7 +122,7 @@ } .usertime-item { - border: 0px solid #ccc; + border: 0 solid #ccc; border-top-left-radius: 3px; border-bottom-left-radius: 3px; padding: 0 5px; Index: /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/server.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/server.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/server.html (working copy) @@ -1,91 +1,87 @@ -
-
- -
- -
-
- - -
- - -
-
- - -
+
+ +
+
+ +
+ + +
+
+ + +
-
{{'Search'|T}}
- -
-
{{'Export'|T}}
+
{{'Search' | T}}
+ +
+
{{'Export' | T}}
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
No.{{ 'Server' | T }}{{ 'Times' | T }}
- -
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ row.server }} - {{row.times}} -
{{'Loading...' | T }}
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No.{{ 'Server' | T }}{{ 'Times' | T }}
+ +
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ row.server }} + {{row.times}} +
No matching records found.
{{'Loading...' | T }}
- +
+
-
\ No newline at end of file +
Index: /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/statistics.html =================================================================== --- /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/statistics.html (revision 2492) +++ /branches/amp_3_7/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/statistics.html (working copy) @@ -1,25 +1,31 @@ -
-
- - {{item.verbose_name}} - - − - -
-
- -
+
+ + {{item.verbose_name}} + + − + +
+
+
-
+
\ No newline at end of file + Index: /branches/amp_3_7/extensions/monitoring/webui/alerting/alert_rule/threshold_alert/threshold_alert.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/alerting/alert_rule/threshold_alert/threshold_alert.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/alerting/alert_rule/threshold_alert/threshold_alert.html (working copy) @@ -1,134 +1,152 @@ -
-
-
-
-
- - -
+
+
+
+
+ +
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'Rule Name' | T }}{{ 'Rule Description' | T }}{{ 'Resource Range' | T }}{{ 'Product' | T }} - {{ 'Status' | T }} - - {{ 'Notification' | T }}{{ 'Action' | T }}
- - - - - -
{{ item.name }}{{ item.remark }}{{ item.dimension }}{{ item.product_verbose_name | T }} - - {{'Paused'|T}} - - - {{'Ok'|T}} - - - {{'Alerting'|T}} - - - {{'No Data'|T}} - - - {{'Pending'|T}} - - - {{'Unknown'|T}} - - {{item.for_time}} - - - - - - - - - - - - - - - - -
{{ 'You do not have any alert rules.' | T }}
-
-
-
-
- -
- + + + + + + + + + + + + + + + {{ item.name }} + {{ item.remark }} + {{ item.dimension }} + {{ item.product_verbose_name | T }} + + + {{'Paused' | T}} + + + {{'Ok' | T}} + + + {{'Alerting' | T}} + + + {{'No Data' | T}} + + + {{'Pending' | T}} + + + {{'Unknown' | T}} + + {{item.for_time}} + + + + + + + + +    + + +    + + +    + + + + + + + + {{ 'You do not have any alert rules.' | T }} + + + + +
+
+
+
+
+
+
+ \ No newline at end of file Index: /branches/amp_3_7/extensions/monitoring/webui/alerting/initiative/initiative_alert.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/alerting/initiative/initiative_alert.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/alerting/initiative/initiative_alert.html (working copy) @@ -1,14 +1,18 @@
-
+
- - {{alert.verbose_name | T}} + + {{alert.verbose_name | T}}
{{alert.description | T}}
{{'Initiative Alert' | T}} - +
@@ -18,44 +22,50 @@
- - - - - - + + + + + + - - - - - - + + + + + +
{{ 'Rule Description' | T }}{{ 'Status' | T }}{{ 'Notification' | T }}{{ 'Action' | T }}
{{ 'Rule Description' | T }}{{ 'Status' | T }}{{ 'Notification' | T }}{{ 'Action' | T }}
{{ item.remark }} - - {{'Paused'|T}} - - {{'Enabled'|T}} - - - - - - - - - - - - - -
{{ item.remark }} + + {{'Paused' | T}} + + {{'Enabled' | T}} + + + + + + + + + + + + + +
- {{ 'Initiative Alert has not enabled' | T }} +
{{ 'Initiative Alert has not enabled' | T }}
Index: /branches/amp_3_7/extensions/monitoring/webui/event/event.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/event/event.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/event/event.html (working copy) @@ -2,11 +2,11 @@
-
-
-
-
+
+
+
+
\ No newline at end of file Index: /branches/amp_3_7/extensions/monitoring/webui/event/query_event/query_event.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/event/query_event/query_event.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/event/query_event/query_event.html (working copy) @@ -1,92 +1,109 @@ -
-
- - {{item.verbose_name}} - - − - +
+ -
- - - - -
{{'Search'|T}}
- -
-
{{'Add Event Alert'|T}}
- -
-
-
-
+ {{item.verbose_name}} + + − + +
+
+ + + + +
{{'Search' | T}}
+ +
+
{{'Add Event Alert' | T}}
+
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
No.{{ 'Product Name' | T }}{{ 'Event Name' | T }}{{ 'Event Quantity' | T }}{{ 'Action' | T }}
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.product_verbose_name | T }}{{ item.event_verbose_name | T}}{{ item.event_quantity }} - {{'View Detail' | T}} -
{{ 'No related event information' | T }}
-
-
-
-
-
- -
- +
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
No.{{ 'Product Name' | T }}{{ 'Event Name' | T }}{{ 'Event Quantity' | T }}{{ 'Action' | T }}
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.product_verbose_name | T }}{{ item.event_verbose_name | T}}{{ item.event_quantity }} + {{'View Detail' | T}} +
{{ 'No related event information' | T + }} +
+
+
+
+
+
+
+
- +
+
Index: /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js (working copy) @@ -151,4 +151,3 @@ } ]); - Index: /branches/amp_3_7/extensions/monitoring/webui/reporting/reporting.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/reporting/reporting.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/reporting/reporting.html (working copy) @@ -2,19 +2,22 @@
-
-
-
-
-
+
+
+
+
+
Index: /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reporting-add.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reporting-add.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reporting-add.html (working copy) @@ -1,8 +1,8 @@
-

{{'Add Report Task'|T}}

-

{{'Edit Report Task'|T}}

+
{{'Add Report Task'|T}}
+
{{'Edit Report Task'|T}}
Index: /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reportings.controller.js =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reportings.controller.js (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reportings.controller.js (working copy) @@ -417,8 +417,7 @@ } else if (modalViewModel.subject_type == "device_patrol") { modalViewModel.subjectList = [ { "name": (CMSettings.app == "AMP") ? "Server Load Balance" : "SSL Security Gateway", "verbose_name": (CMSettings.app == "AMP") ? "Server Load Balance" : "SSL Security Gateway" }, - { "name": "SSLVPN", "verbose_name": "SSLVPN" }, - { "name": "LLB", "verbose_name": "Link Load Balancers" }, + { "name": "SSLVPN", "verbose_name": "SSLVPN" } ]; if (modalData.args.subject) { modalViewModel.subject = JSON.stringify(modalData.args.subject); @@ -482,8 +481,7 @@ } else if (modalViewModel.subject_type == "device_patrol") { modalViewModel.subjectList = [ { "name": (CMSettings.app == "AMP") ? "Server Load Balance" : "SSL Security Gateway", "verbose_name": (CMSettings.app == "AMP") ? "Server Load Balance" : "SSL Security Gateway" }, - { "name": "SSLVPN", "verbose_name": "SSLVPN" }, - { "name": "LLB", "verbose_name": "Link Load Balancers" }, + { "name": "SSLVPN", "verbose_name": "SSLVPN" } ]; modalViewModel.subject = JSON.stringify({ "name": (CMSettings.app == "AMP") ? "Server Load Balance" : "SSL Security Gateway", "verbose_name": (CMSettings.app == "AMP") ? "Server Load Balance" : "SSL Security Gateway" }); } else if (modalViewModel.subject_type == "automatic_diagnose") { @@ -695,4 +693,3 @@ } } ]); - Index: /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reportings.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reportings.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/cron_reportings/cron_reportings.html (working copy) @@ -1,115 +1,129 @@ -
-
- - -
-
-
- - - -
+
+ +
+
+
+ + +
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + +
{{ 'Task Name' | T }}{{ 'Subject Type' | T }}{{ 'Subject Name' | T }}{{ 'Spec' | T }}{{ 'Status' | T }}{{ 'Next Run Time' | T }}{{ 'Notification' | T }}{{ 'Action' | T }}
- -
{{ item.name }}{{ item.typeVerbose | T}} - {{ item.subject_name }} - - {{ item.subject_name }} - {{ item.spec }} - - {{'Paused'|T}} +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - -
{{ 'Task Name' | T }}{{ 'Subject Type' | T }}{{ 'Subject Name' | T }}{{ 'Spec' | T }}{{ 'Status' | T }}{{ 'Next Run Time' | T }}{{ 'Notification' | T }}{{ 'Action' | T }}
+ +
{{ item.name }}{{ item.typeVerbose | T}} + {{ item.subject_name }} + + {{ item.subject_name }} + {{ item.spec }} + + {{'Paused' | T}} - - {{'Running'|T}} + + {{'Running' | T}} - - {{'Ready'|T}} - {{ item.next_run_time_text}} - - - - - - - - -
-
-
-
-
-
- -
- + + {{'Ready' | T}} +
{{ item.next_run_time_text}} + + + +    +    +    +    + +
No matching records found.
+
+
+
+
+
+
+
- -
+
+
+
\ No newline at end of file + Index: /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/gen_reportings/gen_reporting-detail.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/gen_reportings/gen_reporting-detail.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/gen_reportings/gen_reporting-detail.html (working copy) @@ -1,7 +1,7 @@
-

{{'Report Detail'|T}}

+
{{'Report Detail'|T}}
Index: /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/gen_reportings/gen_reportings.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/gen_reportings/gen_reportings.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/reporting/tabs/gen_reportings/gen_reportings.html (working copy) @@ -1,94 +1,108 @@ -
-
- - -
-
-
- - -
+
+ +
+
+
+ +
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'Create Time' | T }}{{ 'Task Name' | T }}{{ 'Subject Name' | T }}{{ 'Status' | T }}{{ 'Action' | T }}
- -
{{ item.time_text }}{{ item.name }}{{ item.subject_name }} - - - - - - - - -
-
-
-
-
- -
- + + + + + + + + + + + {{ item.time_text }} + {{ item.name }} + {{ item.subject_name }} + + + + + + + + + + + + + + + No matching records found. + + + +
+
+
+
+
+
- -
+
+
+
- Index: /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb_details.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb_details.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb_details.html (working copy) @@ -1,6 +1,6 @@ -
-
+
+
@@ -8,9 +8,10 @@
  • - - - {{"Time selection" | T}} + + + {{"Time selection" | T}}
    • @@ -20,35 +21,35 @@
    -
    +
    {{'Throughput' | T}}
    -
    +
    {{'Bandwidth Usage' | T}}
    -
    +
    {{'Connections' | T}}
    -
    +
    {{'Hits Number' | T}}
    @@ -63,4 +64,3 @@
    - Index: /branches/amp_3_7/extensions/monitoring/webui/resource/resource.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/resource.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/resource.html (working copy) @@ -2,24 +2,26 @@
    +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    -
    - Index: /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js (working copy) @@ -2194,4 +2194,3 @@ ]); - Index: /branches/amp_3_7/extensions/monitoring/webui/resource/slb/real_service.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/slb/real_service.html (revision 2492) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/slb/real_service.html (working copy) @@ -1,109 +1,130 @@ -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    No.{{ 'Service Name' | T }}{{ 'Service Type' | T }}{{ 'IP Address' | T }}{{ 'Port' | T }}{{ 'Health Status' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'Outstanding Requests' | T }}{{ 'Connections Per Second' | T }}{{ 'Received' | T }}{{ 'Sent' | T }}
    - - - - - - - -
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }} {{ item.name }}{{ item.type }}{{ item.addr }}{{ item.port }} -
    - -
    -
    - -
    -     		{{ item.device.name }}{{ item.device.device_group }}{{ item.graph_data.request }}{{ item.graph_data.conn }}{{item.graph_data.received }}{{item.graph_data.sent }}
    {{ 'You do not have any real service information.' | T }}
    +
    +
    -
    -
    -
    -
    - -
    - + + + + + + + + + + + + + {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }} + + {{ item.name }} + {{ item.type }} + {{ item.addr }} + {{ item.port }} + +
    + +
    +
    + +
    + + + {{ item.device.name }} + {{ item.device.device_group }} + {{ item.graph_data.request }} + {{ item.graph_data.conn }} + {{item.graph_data.received + }} + {{item.graph_data.sent }} + + + + + {{ 'You do not have any real service information.' | T }} + + + + +
    +
    +
    +
    +
    +
    +
    +
    - +
    +
    + - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/common_alert_dialog.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/common_alert_dialog.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/common_alert_dialog.html (working copy) @@ -1,6 +1,6 @@
    -

    {{'Message' | T}}

    +
    {{'Message' | T}}
    {{commonAlert.message}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/confirm.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/confirm.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/confirm.html (working copy) @@ -1,8 +1,8 @@
    -

    {{'Confirm Selected VF(s)'|T}}

    +
    {{'Confirm Selected VF(s)'|T}}
    -
    \ No newline at end of file +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/delete_confirm.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/delete_confirm.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/delete_confirm.html (working copy) @@ -1,18 +1,18 @@
    -

    {{'Delete Confirm'|T}}

    +
    {{'Delete Confirm' | T}}
    {{confirm.info}}
    - - + +
    - \ No newline at end of file + } + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/engineering.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/engineering.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/engineering.html (working copy) @@ -1,6 +1,6 @@
    -

    {{ 'Engineering Mode' | T}}

    +
    {{ 'Engineering Mode' | T}}
    @@ -89,12 +89,12 @@ window.QuoteKeys = true; function $id(id){ return document.getElementById(id); } var IsArray = function(obj) { - return obj && - typeof obj === 'object' && + return obj && + typeof obj === 'object' && typeof obj.length === 'number' && !(obj.propertyIsEnumerable('length')); } - + var Process = function(data){ window.TAB = MultiplyString(2, window.SINGLE_TAB); window.IsCollapsible = true; @@ -111,17 +111,17 @@ } $('.debug_info .fa-download').click(function(){ var data_to_download = $('.Canvas .CodeContainer').text().replace(/\n/g, "\r\n"); - var blob = new Blob([data_to_download], {type: "text/plain"}); - var fileName = 'debug_info.txt'; + var blob = new Blob([data_to_download], {type: "text/plain"}); + var fileName = 'debug_info.txt'; var a = document.createElement("a"); a.id = 'debug_info'; - document.body.appendChild(a); + document.body.appendChild(a); if (navigator.appVersion.toString().indexOf('.NET') > 0) { // for IE browser window.navigator.msSaveBlob(blob, fileName); } else { // for other browsers - a.download = fileName; - a.href = URL.createObjectURL(blob); - a.click(); + a.download = fileName; + a.href = URL.createObjectURL(blob); + a.click(); } document.body.removeChild(document.getElementById('debug_info')); }); @@ -130,7 +130,7 @@ window._regexpObj = new RegExp(); var ProcessObject = function(obj, indent, addComma, isArray, isPropertyContent){ var html = ""; - var comma = (addComma) ? ", " : ""; + var comma = (addComma) ? ", " : ""; var type = typeof obj; var clpsHtml =""; if (IsArray(obj)){ @@ -148,10 +148,10 @@ } else if (type == 'object') { if (obj == null){ html += FormatLiteral("null", "", comma, indent, isArray, "Null"); - }else if (obj.constructor == window._dateObj.constructor) { - html += FormatLiteral("new Date(" + obj.getTime() + ") /*" + obj.toLocaleString()+"*/", "", comma, indent, isArray, "Date"); + }else if (obj.constructor == window._dateObj.constructor) { + html += FormatLiteral("new Date(" + obj.getTime() + ") /*" + obj.toLocaleString()+"*/", "", comma, indent, isArray, "Date"); }else if (obj.constructor == window._regexpObj.constructor) { - html += FormatLiteral("new RegExp(" + obj + ")", "", comma, indent, isArray, "RegExp"); + html += FormatLiteral("new RegExp(" + obj + ")", "", comma, indent, isArray, "RegExp"); }else{ var numProps = 0; for(var prop in obj) numProps++; @@ -175,7 +175,7 @@ html += FormatLiteral(obj, "", comma, indent, isArray, "Boolean"); } else if (type == 'function') { if (obj.constructor == window._regexpObj.constructor) { - html += FormatLiteral("new RegExp(" + obj + ")", "", comma, indent, isArray, "RegExp"); + html += FormatLiteral("new RegExp(" + obj + ")", "", comma, indent, isArray, "RegExp"); } else { obj = FormatFunction(indent, obj); html += FormatLiteral(obj, "", comma, indent, isArray, "Function"); @@ -194,7 +194,7 @@ if(isArray) str = GetRow(indent, str); return str; } - + var FormatFunction = function(indent, obj){ var tabs = ""; for(var i = 0; i < indent; i++) tabs += window.TAB; @@ -205,26 +205,26 @@ } return str; } - + var GetRow = function(indent, data, isPropertyContent){ var tabs = ""; for(var i = 0; i < indent && !isPropertyContent; i++) tabs += window.TAB; if(data != null && data.length > 0 && data.charAt(data.length-1) != "\n") data = data+"\n"; - return tabs+data; - + return tabs+data; + } - - + + var CollapseAllClicked = function(){ TraverseChildren($id("Canvas"), function(element){ if(element.className == 'collapsible'){ MakeContentVisible(element, false); - + } }, 0); } - + var ExpandAllClicked = function(){ TraverseChildren($id("Canvas"), function(element){ if(element.className == 'collapsible'){ @@ -232,7 +232,7 @@ } }, 0); } - + var MakeContentVisible = function(element, visible){ var img = element.previousSibling.firstChild; if(!!img.tagName && img.tagName.toLowerCase() == "img"){ @@ -240,14 +240,14 @@ element.previousSibling.firstChild.src = visible ? window.ImgExpanded : window.ImgCollapsed; } } - + var TraverseChildren = function(element, func, depth){ for(var i = 0; i < element.childNodes.length; i++){ TraverseChildren(element.childNodes[i], func, depth + 1); } func(element, depth); } - + var ExpImgClicked = function(img){ var container = img.parentNode.nextSibling; if(!container) return; @@ -260,19 +260,19 @@ container.style.display = disp; img.src = src; } - + var CollapseLevel = function(level){ TraverseChildren($id("Canvas"), function(element, depth){ if(element.className == 'collapsible'){ if(depth >= level){ MakeContentVisible(element, false); } else { - MakeContentVisible(element, true); + MakeContentVisible(element, true); } } }, 0); } - + var MultiplyString = function(num, str){ var sb =[]; for(var i = 0; i < num; i++){ @@ -280,14 +280,14 @@ } return sb.join(""); } - + var LinkToJson = function(){ var val = $id("RawJson").value; val = escape(val.split('/n').join(' ').split('/r').join(' ')); $id("InvisibleLinkUrl").value = val; $id("InvisibleLink").submit(); } - +
    @@ -344,4 +344,4 @@ margin-top: 30px; width: 1000px; } - \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/licenseExpire.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/licenseExpire.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/licenseExpire.html (working copy) @@ -1,5 +1,5 @@
    -

    {{'Please Import License Key'|T}}

    +
    {{'Please Import License Key'|T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/pipe_action_modal.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/pipe_action_modal.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/pipe_action_modal.html (working copy) @@ -1,11 +1,11 @@
    -

    {{pipeAction.title|T}}

    +
    {{pipeAction.title|T}}
    -
    +

    -
    \ No newline at end of file +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/progress.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/progress.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/progress.html (working copy) @@ -1,6 +1,6 @@
    -

    {{'Loading...'|T}}

    +
    {{'Loading...'|T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/progress_with_value.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/progress_with_value.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/common/templates/progress_with_value.html (working copy) @@ -1,6 +1,6 @@
    -

    {{'Loading...'|T}}

    +
    {{'Loading...'|T}}
    {{value}}% Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/modal/configTemp.batch.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/modal/configTemp.batch.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/modal/configTemp.batch.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Batch Processing' | T}}

    +
    {{ 'Batch Processing' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/modal/configTemp.check.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/modal/configTemp.check.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/modal/configTemp.check.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Compliance Check' | T}}

    +
    {{ 'Compliance Check' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_acl/modal/aclTemp.add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_acl/modal/aclTemp.add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_acl/modal/aclTemp.add.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Add ACL Template' | T}}

    +
    {{ 'Add ACL Template' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_custom/modal/customTemp.add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_custom/modal/customTemp.add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_custom/modal/customTemp.add.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Add New Custom Template' | T}}

    +
    {{ 'Add New Custom Template' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_role/modal/role-add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_role/modal/role-add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_role/modal/role-add.html (working copy) @@ -1,8 +1,7 @@
    - -

    {{ 'Add Role Template' | T}}

    +
    {{ 'Add Role Template' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_vpn/modal/vpnTemp.add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_vpn/modal/vpnTemp.add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/config_template/tab_vpn/modal/vpnTemp.add.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Add VPN Template' | T}}

    +
    {{ 'Add VPN Template' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/config.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/config.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/config.html (working copy) @@ -2,19 +2,18 @@
    -
    -
    -
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/apvconfig.edit.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/apvconfig.edit.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/apvconfig.edit.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Edit Configuration' | T}}---{{editAPVConfig.file_name}}

    +
    {{ 'Edit Configuration' | T}}---{{editAPVConfig.file_name}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.add.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Add Config' | T}}

    +
    {{ 'Add Config' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.backup.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.backup.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.backup.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Backup Configuration' | T}}

    +
    {{ 'Backup Configuration' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.backupAll.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.backupAll.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.backupAll.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Select Devices For Batch Backup' | T}}

    +
    {{ 'Select Devices For Batch Backup' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.check-mutil.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.check-mutil.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.check-mutil.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Select Device' | T}}

    +
    {{ 'Select Device' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.check.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.check.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.check.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Configuration Comparison' | T}}

    +
    {{ 'Configuration Comparison' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.clone.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.clone.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.clone.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Clone Configuration' | T}}

    +
    {{ 'Clone Configuration' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.complianceCheck.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.complianceCheck.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.complianceCheck.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Configuration Comparison' | T}}

    +
    {{ 'Configuration Comparison' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.add.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Create Customzied Config File' | T}}

    +
    {{ 'Create Customzied Config File' | T}}
    @@ -96,11 +96,11 @@ margin-top: 30px; width: 940px; } - .file-box{ + .file-box{ position: relative; - } - .file{ - position: absolute; + } + .file{ + position: absolute; top: 0; opacity: 0; } Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.add.type.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.add.type.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.add.type.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Select Customized Configuration Type' | T}}

    +
    {{ 'Select Customized Configuration Type' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.template.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.template.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.template.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Create Customzied Template Config File' | T}}

    +
    {{ 'Create Customzied Template Config File' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.upload.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.upload.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.custom.upload.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Create Customzied Config File' | T}}

    +
    {{ 'Create Customzied Config File' | T}}
    @@ -93,11 +93,11 @@
    \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config_task_diff.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config_task_diff.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config_task_diff.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Diff Information' | T}}

    +
    {{ 'Diff Information' | T}}
    @@ -41,7 +41,7 @@
    - +
    @@ -61,4 +61,4 @@ th { width: 160px; } - \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config_task_output.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config_task_output.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config_task_output.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Apply Result' | T}}

    +
    {{ 'Apply Result' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/customize.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/customize.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/customize.html (working copy) @@ -1,53 +1,66 @@ -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -37,8 +40,9 @@ - + @@ -52,6 +56,7 @@ st-page-change="onPageChange(newPage)"> - + + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html (working copy) @@ -1,6 +1,6 @@
    -

    {{'Add a Device Group'|T}}

    +
    {{'Add a Device Group'|T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_manage.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_manage.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_manage.html (working copy) @@ -1,6 +1,6 @@
    -

    {{'Bind Devices'|T}}

    +
    {{'Bind Devices'|T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/index.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/index.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/index.html (working copy) @@ -1,16 +1,15 @@ -
    -
    +
    +
    -
    -
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.html (working copy) @@ -1,52 +1,198 @@ -
    -
    - +
    +
    +
    + {{'Installed Extensions' | T}} + {{'Installed Extensions (edit mode)' | T}} +
    +
    +
    + + + + + + +
    +
    +
    +
    +
    +
    + {{'Disabled' | T}}: +
    +
    + {{'Enabled' | T}}: +
    +
    + +
    +
    +
    +
    +
    +
    +
    + + + +
    + {{each_extension.name}} +
    +
    +
    + + + +
    + {{each_extension.name}} +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    No.{{ 'File Name' | T }}{{ 'File Type' | T }}{{ 'Device Type' | T }}{{ 'Create Time' | T }}{{ 'Modify Time' | T }}{{ 'Comment' | T }}{{ 'Action' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ configItem.name }}{{ configItem.file_type }}{{ configItem.device_type }}{{ configItem.create_time }}{{ configItem.modify_time }}{{ configItem.comment }} - - - - -
    -
    +
    +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    No.{{ 'File Name' | T }}{{ 'File Type' | T }}{{ 'Device Type' | T }}{{ 'Create Time' | T }}{{ 'Modify Time' | T }}{{ 'Comment' | T }}{{ 'Action' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ configItem.name }}{{ configItem.file_type }}{{ configItem.device_type }}{{ configItem.create_time }}{{ configItem.modify_time }}{{ configItem.comment }} +    +    +    + +
    No matching records found.
    +
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/customize_basic.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/customize_basic.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/customize_basic.html (working copy) @@ -1,18 +1,17 @@ -
    -
    +
    -
    +
    -
    \ No newline at end of file +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/device.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/device.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/device.html (working copy) @@ -1,53 +1,64 @@ -
    -
    -
    - -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    No.{{ 'Device Name' | T }}{{ 'Device Type' | T }}{{ 'Last Backup Time' | T }}{{ 'Action' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ configItem.name }}{{ configItem.device_type }}{{ configItem.last_backup_time }} - - - - - - - -
    -
    -
    +
    +
    +
    +
    + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    No.{{ 'Device Name' | T }}{{ 'Device Type' | T }}{{ 'Last Backup Time' | T }}{{ 'Action' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ configItem.name }}{{ configItem.device_type }}{{ configItem.last_backup_time }} +    +    +    +    + +
    No matching records found.
    +
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/system.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/system.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/system.html (working copy) @@ -1,55 +1,64 @@ -
    - -
    -
    -
    -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    No.{{ 'File Name' | T }}{{ 'File Type' | T }}{{ 'Device Type' | T }}{{ 'Create Time' | T }}{{ 'Clone Source' | T }}{{ 'Comment' | T }}{{ 'Action' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ configItem.name }}{{ configItem.file_type }}{{ configItem.device_type }}{{ configItem.create_time }}{{ configItem.modify_time }}{{ configItem.comment }} - - - - - -
    -
    -
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    No.{{ 'File Name' | T }}{{ 'File Type' | T }}{{ 'Device Type' | T }}{{ 'Create Time' | T }}{{ 'Clone Source' | T }}{{ 'Comment' | T }}{{ 'Action' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ configItem.name }}{{ configItem.file_type }}{{ configItem.device_type }}{{ configItem.create_time }}{{ configItem.modify_time }}{{ configItem.comment }} +    +    +    +    + +
    No matching records found.
    +
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/template.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/template.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/tabs/template.html (working copy) @@ -1,51 +1,59 @@ -
    - -
    -
    - - -
    -
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    No.{{ 'Template Key Word' | T }}{{ 'Description' | T }}{{ 'Default Value' | T }}{{ 'Action' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.key }}{{ item.description }}{{ item.default_value }} - - -
    -
    -
    + +
    +
    + + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    No.{{ 'Template Key Word' | T }}{{ 'Description' | T }}{{ 'Default Value' | T }}{{ 'Action' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.key }}{{ item.description }}{{ item.default_value }} +    + +
    No matching records found.
    +
    +
    +
    - -
    +
    + +
    @@ -54,37 +62,31 @@
    - +
    - - - - + + + + - - - - - + + + + + -
    No.{{ item }}
    No.{{ item }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ each }} - -
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ each }} + +
    - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/dashboard.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/dashboard.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/dashboard.html (working copy) @@ -1,16 +1,18 @@
    -
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html (working copy) @@ -1,76 +1,9 @@
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - {{'Total Alerts in 7 Days'|T}} - {{monitorOverview.alertingLogNum}} -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - {{'Is Alerting'|T}} - {{monitorOverview.alertingNum}} -
    -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    - {{'Insufficient Data'|T}} - {{monitorOverview.noDataNum}} -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - {{'Total events in 7 Days'|T}} - {{monitorOverview.eventNum}} -
    -
    -
    -
    -
    -
    - -
    @@ -78,36 +11,48 @@
    -  {{'CPU Usage'|T}} {{'Top 5' | T}} + +  {{'CPU Usage' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - + + + + + + - + + + + + +
    No.{{'Device Name' | T}}{{'Usage' | T}}
    No.{{'Device Name' | T}}{{'Usage' | T}}
    {{$index + 1}}{{ item.name }} -
    -
    -
    -
    - {{item.cpu_usage}}% -
    +
    {{$index + 1}} + {{ item.name }} +
    +
    +
    +
    + {{item.cpu_usage}}%
    -
    + {{ 'No matching records found.' | T }} +
    @@ -116,37 +61,49 @@
    -  {{'Network Memory Usage'|T}} {{'Top 5' | T}} + +  {{'Network Memory Usage' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - + + + + + + - + + + + + +
    No.{{'Device Name' | T}}{{'Usage' | T}}
    No.{{'Device Name' | T}}{{'Usage' | T}}
    {{$index + 1}}{{ item.name}} -
    -
    -
    -
    - {{item.net_mem_usage}}% -
    +
    {{$index + 1}} + {{ item.name}} +
    +
    +
    +
    + {{item.net_mem_usage}}%
    -
    + {{ 'No matching records found.' | T }} +
    @@ -156,29 +113,39 @@
    -  {{'Network Throughput'|T}} {{'Top 5' | T}} + +  {{'Network Throughput' | T}} {{'Top 5' | T}} +
    - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + +
    No.{{'Device Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    No.{{'Device Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    {{$index + 1}}{{ item.name}}{{item.sent}}{{item.received}}
    {{$index + 1}} + {{ item.name}}{{item.sent}}{{item.received}}
    + {{ 'No matching records found.' | T }} +
    @@ -190,26 +157,36 @@
    -  {{'Hits Number'|T}} {{'Top 5' | T}} + +  {{'Hits Number' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - - + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Hits' | T}}
    No.{{'Service Name' | T}}{{'Hits' | T}}
    {{$index + 1}}{{ item.name }}{{item.hits}}
    {{$index + 1}} + {{ item.name }}{{item.hits}}
    + {{ 'No matching records found.' | T }} +
    @@ -218,26 +195,36 @@
    -  {{'Open Connections'|T}} {{'Top 5' | T}} + +  {{'Open Connections' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - - + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Connections' | T}}
    No.{{'Service Name' | T}}{{'Connections' | T}}
    {{$index + 1}}{{ item.name }}{{item.connections}}
    {{$index + 1}} + {{ item.name }}{{item.connections}}
    + {{ 'No matching records found.' | T }} +
    @@ -246,29 +233,39 @@
    -  {{'Network Throughput'|T}} {{'Top 5' | T}} + +  {{'Network Throughput' | T}} {{'Top 5' | T}} +
    - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    No.{{'Service Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    {{$index + 1}}{{ item.name }}{{item.sent}}{{item.received}}
    {{$index + 1}} + {{ item.name }}{{item.sent}}{{item.received}}
    + {{ 'No matching records found.' | T }} +
    @@ -280,26 +277,36 @@
    -  {{'Outstanding Requests'|T}} {{'Top 5' | T}} + +  {{'Outstanding Requests' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - - + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Requests' | T}}
    No.{{'Service Name' | T}}{{'Requests' | T}}
    {{$index + 1}}{{ item.name }}{{item.requests}}
    {{$index + 1}} + {{ item.name }}{{item.requests}}
    + {{ 'No matching records found.' | T }} +
    @@ -308,26 +315,36 @@
    -  {{'Connections Per Second'|T}} {{'Top 5' | T}} + +  {{'Connections Per Second' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - - + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Connections' | T}}
    No.{{'Service Name' | T}}{{'Connections' | T}}
    {{$index + 1}}{{ item.name }}{{item.connections}}
    {{$index + 1}} + {{ item.name }}{{item.connections}}
    + {{ 'No matching records found.' | T }} +
    @@ -336,29 +353,39 @@
    -  {{'Network Throughput'|T}} {{'Top 5' | T}} + +  {{'Network Throughput' | T}} {{'Top 5' | T}} +
    - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    No.{{'Service Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    {{$index + 1}}{{ item.name }}{{item.sent}}{{item.received}}
    {{$index + 1}} + {{ item.name }}{{item.sent}}{{item.received}}
    + {{ 'No matching records found.' | T }} +
    @@ -370,26 +397,36 @@
    -  {{'Sessions Number'|T}} {{'Top 5' | T}} + +  {{'Sessions Number' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - - + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Sessions' | T}}
    No.{{'Service Name' | T}}{{'Sessions' | T}}
    {{$index + 1}}{{ item.name }}{{item.active_sessions}}
    {{$index + 1}} + {{ item.name }}{{item.active_sessions}}
    + {{ 'No matching records found.' | T }} +
    @@ -398,28 +435,38 @@
    -  {{'Client Throughput'|T}} {{'Top 5' | T}} + +  {{'Client Throughput' | T}} {{'Top 5' | T}} +
    - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    No.{{'Service Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    {{$index + 1}}{{ item.name }}{{item.sent}}{{item.received}}
    {{$index + 1}} + {{ item.name }}{{item.sent}}{{item.received}}
    + {{ 'No matching records found.' | T }} +
    @@ -428,28 +475,38 @@
    -  {{'Server Throughput'|T}} {{'Top 5' | T}} + +  {{'Server Throughput' | T}} {{'Top 5' | T}} +
    - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + +
    No.{{'Service Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    No.{{'Service Name' | T}}{{'Sent' | T}}{{'Received' | T}}
    {{$index + 1}}{{ item.name }}{{item.sent}}{{item.received}}
    {{$index + 1}} + {{ item.name }}{{item.sent}}{{item.received}}
    + {{ 'No matching records found.' | T }} +
    @@ -460,26 +517,35 @@
    -  {{'Hits Number'|T}} {{'Top 5' | T}} + +  {{'Hits Number' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - - + + + + + + + + + + +
    No.{{'Link Name' | T}}{{'Hits' | T}}
    No.{{'Link Name' | T}}{{'Hits' | T}}
    {{$index + 1}}{{ item[2] }}{{item[1]}}
    {{$index + 1}}{{ item[2] }}{{item[1]}}
    + {{ 'No matching records found.' | T }} +
    @@ -488,26 +554,35 @@
    -  {{'Open Connections'|T}} {{'Top 5' | T}} + +  {{'Open Connections' | T}} {{'Top 5' | T}} +
    - - - - - + + + + + - - - - - - - - + + + + + + + + + + +
    No.{{'Link Name' | T}}{{'Connections' | T}}
    No.{{'Link Name' | T}}{{'Connections' | T}}
    {{$index + 1}}{{ item[2] }}{{item[1]}}
    {{$index + 1}}{{ item[2] }}{{item[1]}}
    + {{ 'No matching records found.' | T }} +
    @@ -516,7 +591,10 @@
    -  {{'Network Throughput'|T}} {{'Top 5' | T}} + +  {{'Network Throughput' | T}} {{'Top 5' | T}} +
    @@ -534,10 +612,16 @@ - + + + +
    {{$index + 1}}{{ item[4] }}{{ item[4] }} {{item[3]}} {{item[2]}}
    + {{ 'No matching records found.' | T }} +
    @@ -547,51 +631,51 @@
    -
    -
    - {{'Auditing Log Data'|T}} - -
    -
    -
    -
    +
    +
    +
    + {{'Auditing Log Data' | T}} +
    -
    +
    -
    +
    - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + +
    {{ 'Time' | T }}{{ 'Device IP' | T }}{{ 'LogID' | T }}{{ 'Severity' | T }}
    {{ 'Time' | T }}{{ 'Device Type' | T }}{{ 'Device IP' | T }}{{ 'LogID' | T }}{{ 'Severity' | T }}
    {{ item.time }}{{ item.tag.remote_ip }}{{ item.tag.logid }}{{ item.tag.severity }} - -
    {{ 'No related auditing log' | T }}
    {{ item.time }}{{ item.tag.device_type }}{{ item.tag.remote_ip }}{{ item.tag.logid }}{{ item.tag.severity }}
    + {{ 'No matching records found.' | T }} +
    @@ -604,8 +688,8 @@ - - + .audit-log-drop-down { + margin-top: 8px; + } + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.controller.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.controller.js (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.controller.js (working copy) @@ -16,7 +16,9 @@ '$stateParams', '$uibModal', 'roleMgmtService', - function ($scope, $q, $rootScope, $location, $filter, $state, $interval, dashboardService, deviceService, localStorageService, taskService, storageService, $stateParams, $uibModal, roleMgmtService) { + 'alertService', + 'timeService', + function ($scope, $q, $rootScope, $location, $filter, $state, $interval, dashboardService, deviceService, localStorageService, taskService, storageService, $stateParams, $uibModal, roleMgmtService, alertService, timeService) { $rootScope.title = "Dashboard"; $scope.allow_config = $rootScope.allow_config; $scope.role_info = localStorageService.getWebStorage('role_info'); @@ -27,6 +29,9 @@ dashboard.serviceNum = 'N/A'; dashboard.taskNum = 'N/A'; + dashboard.alertingNum = 0; + dashboard.eventNum = 0; + dashboard.go = function (url) { $state.go(url); }; @@ -297,20 +302,45 @@ var device_type_info = localStorageService.getWebStorage("device_type_info"); var getNubData = function () { - // if (alertService) { - // dashboard.alertStatus = true - // alertService.getAlertList("?page_size=-1").then(function (resp) { - // var alertNum = 0; - // if (resp && resp.status === 200 && resp.data) { - // _.each(resp.data.data.data, function (alert) { - // if ((alert.state != 'ok') && (alert.state != 'paused')) { - // alertNum++ - // } - // }) - // } - // dashboard.alertNum = alertNum; - // }); - // } + let alertingNum = 0; + alertService.getAlertList("?page_size=-1&type=threshold").then(function (resp) { + if (resp && resp.status === 200) { + if (resp.data.code === 0) { + var rulesList = resp.data.data.data; + _.each(rulesList, function (rule) { + if (rule.state === "alerting") { + alertingNum++; + } + }) + dashboard.alertingNum = alertingNum; + } + } + }) + + let eventNum = 0; + let now = new Date(); + let start = new Date(); + start.setTime(now.getTime() - timeService.parseDuration('7d')); + let payload = { + "action": "get_quantity_from_event_deduction", + "query": { + "start_time": start * 1e6, + "end_time": now * 1e6, + } + } + dashboardService.composer_query(payload).then(function (res) { + eventNum = 0; + if (res && res.status === 200) { + if (res.data.results) { + if (res.data.results[0].series) { + _.each(res.data.results[0].series, function (series) { + eventNum = series.values[0][1]; + }) + } + } + dashboard.eventNum = eventNum; + } + }); if (dashboard.get_loading()) { dashboard.serviceList = []; Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.html (working copy) @@ -2,60 +2,106 @@
    -
    -
    -
    - +
    +
    +
    +
    + + +
    -
    +
    - {{'Devices'|T}} - {{systemStatistics.deviceNum}} + {{'Devices' | T}} + {{systemStatistics.deviceNum}}
    -
    -
    -
    - +
    +
    +
    + +
    -
    +
    - {{'Services'|T}} - {{systemStatistics.serviceNum}} + {{'Services' | T}} + {{systemStatistics.serviceNum}}
    -
    -
    -
    - +
    +
    +
    + + +
    -
    +
    - {{'Tasks'|T}} - {{systemStatistics.taskNum}} + {{'Tasks' | T}} + {{systemStatistics.taskNum}}
    - +
    +
    @@ -65,9 +111,10 @@
    - {{systemStatistics.LoadWidget.verbose_name}} + {{systemStatistics.LoadWidget.verbose_name}}
    -
    +
    @@ -81,22 +128,23 @@
    - {{systemStatistics.TrafficWidget.verbose_name}} + {{systemStatistics.TrafficWidget.verbose_name}}
    -
    +
    {{systemStatistics.Outbound.value}} {{systemStatistics.Outbound.unit}}bps - {{'Outbound'|T}} + {{'Outbound' | T}}
    {{systemStatistics.Inbound.value}} {{systemStatistics.Outbound.unit}}bps - {{'Inbound'|T}} + {{'Inbound' | T}}
    @@ -105,7 +153,7 @@
    - {{systemStatistics.TaskWidget.title}} + {{systemStatistics.TaskWidget.title}}
    @@ -116,27 +164,27 @@
    - {{systemStatistics.diskStatusWidget.title}} + {{systemStatistics.diskStatusWidget.title}}
    -
    +
    {{systemStatistics.readRate.value}} {{systemStatistics.readRate.unit}}B/s - {{'Read Rate'|T}} + {{'Read Rate' | T}}
    {{systemStatistics.writeRate.value}} {{systemStatistics.writeRate.unit}}B/s - {{'Write Rate'|T}} + {{'Write Rate' | T}}
    -
    +
    @@ -145,25 +193,20 @@
    - {{ 'Devices' | T}} + {{ 'Devices' | T}}
    -
    +
    -
    \ No newline at end of file + + .icons-row { + height: 20px; + width: 40px; + padding-top: 10px; + } + + .svg-link-icon { + cursor: pointer; + } + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/config.controller.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/config.controller.js (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/config.controller.js (working copy) @@ -17,6 +17,8 @@ getInfo(); } + configViewModal.configurationDetail = null; + function getInfo() { var deviceKey = window.localStorage.__deviceKey__; deviceKey = JSON.parse(deviceKey); Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/config.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/config.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/config.html (working copy) @@ -1,4 +1,4 @@ -
    +
    @@ -9,4 +9,3 @@ 
    {{config.configurationDetail}}
    - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/device-detail.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/device-detail.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/device-detail.html (working copy) @@ -1,24 +1,24 @@ -
    -
    -
    -
    -
    +
    +
    +
    -
    -
    -
    - -
    +
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/overview.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/overview.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/detail/overview.html (working copy) @@ -1,122 +1,107 @@ - -
    +
    - - - + + +
    -
    -
    -
    -
    {{ 'Device Switch' | T}}
    - -
    - -
    -
    - -
    +
    +
    +
    {{ 'Device Switch' | T}}
    + +
    + +
    +
    +
    - -
    +
    +
    -
    -
    -
    -
    {{ 'License Information' | T}}
    -
    - - - - - - - - - - - - - - - - - - - -
    {{ 'License Key' | T}}{{ overview.detail.license_key }}
    {{ 'Expiration Date' | T}}{{ overview.detail.license_date }}
    {{ 'Licensed Limits' | T}}{{ overview.detail.license_limit }}
    {{ 'Licensed Features' | T}}{{ overview.detail.license_feature }}
    +
    +
    +
    {{ 'License Information' | T}}
    +
    + + + + + + + + + + + + + + + + + + + +
    {{ 'License Key' | T}}{{ overview.detail.license_key }}
    {{ 'Expiration Date' | T}}{{ overview.detail.license_date }}
    {{ 'Licensed Limits' | T}}{{ overview.detail.license_limit }}
    {{ 'Licensed Features' | T}}{{ overview.detail.license_feature }}
    -
    -
    -
    -
    -
    {{ 'System Info' | T}}
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ 'Host name' | T}}{{ overview.detail.host_name }}
    {{ 'Model Type' | T}}{{ overview.detail.model }}
    {{ 'Serial Number' | T}}{{ overview.detail.serial_number }}
    {{ 'Build Version' | T}}{{ overview.detail.build_version }}
    {{ 'System CPU' | T}}{{ overview.detail.system_cpu }}
    {{ 'System RAM' | T}}{{ overview.detail.system_ram }}
    {{ 'System Boot Time' | T}}{{ overview.detail.system_boot_time }}
    {{ 'System Up Time' | T}}{{ overview.detail.system_up_time }}
    {{ 'Platform Build Date' | T}}{{ overview.detail.platform_bld_date }}
    {{ 'SSL Hardware' | T}}{{ overview.detail.ssl_hw }}
    -
    +
    +
    +
    {{ 'System Info' | T}}
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'Host name' | T}}{{ overview.detail.host_name }}
    {{ 'Model Type' | T}}{{ overview.detail.model }}
    {{ 'Serial Number' | T}}{{ overview.detail.serial_number }}
    {{ 'Build Version' | T}}{{ overview.detail.build_version }}
    {{ 'System CPU' | T}}{{ overview.detail.system_cpu }}
    {{ 'System RAM' | T}}{{ overview.detail.system_ram }}
    {{ 'System Boot Time' | T}}{{ overview.detail.system_boot_time }}
    {{ 'System Up Time' | T}}{{ overview.detail.system_up_time }}
    {{ 'Platform Build Date' | T}}{{ overview.detail.platform_bld_date }}
    {{ 'SSL Hardware' | T}}{{ overview.detail.ssl_hw }}
    -
    \ No newline at end of file +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/device.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/device.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/device.html (working copy) @@ -2,91 +2,121 @@
    - {{ 'Managed Device' | T }} + {{ 'Managed Device' | T }}
    - - - + + +
    - +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + +
    No.{{ 'Name' | T }}{{ 'Device Group' | T }}{{ 'Type' | T }}{{ 'Model' | T }}{{ 'IP' | T }}{{ 'Protocol' | T }}{{ 'Connected' | T }}{{ 'Action' | T }}
    - - - -
    No.{{ 'Name' | T }}{{ 'Device Group' | T }}{{ 'Type' | T }}{{ 'Model' | T }}{{ 'IP' | T }}{{ 'Protocol' | T }}{{ 'Connected' | T }}{{ 'Action' | T }}
    + + + +
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ deviceItem.name }}{{ deviceItem.device_group }}{{ deviceItem.type }}{{ deviceItem.model}}{{ deviceItem.ip}}{{ deviceItem.protocol_verbose}} -
    - - -
    -     		- - - - - -
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ deviceItem.name }}{{ deviceItem.device_group }}{{ deviceItem.type }}{{ deviceItem.model}}{{ deviceItem.ip}}{{ deviceItem.protocol_verbose}} +
    + + +
    +     		+   +   +   +   + +
    -
    -
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.add.html (working copy) @@ -1,8 +1,8 @@
    - - -

    {{ 'Add New Device' | T}}

    + +
    {{ 'Add New Device' | T}}
    @@ -10,7 +10,8 @@
    - +
    @@ -54,17 +55,21 @@
    - +
    - +
    - +
    @@ -73,7 +78,8 @@
    @@ -82,7 +88,8 @@
    - +
    @@ -90,7 +97,8 @@
    @@ -99,7 +107,8 @@
    @@ -108,13 +117,15 @@
    - +
    - +
    @@ -131,7 +142,8 @@
    - +
    @@ -148,7 +160,8 @@
    - +
    @@ -157,7 +170,8 @@
    @@ -165,7 +179,8 @@
    @@ -174,10 +189,12 @@
    @@ -202,20 +219,23 @@
    - +
    - +
    @@ -223,7 +243,8 @@
    @@ -234,7 +255,9 @@
    - +
    @@ -249,4 +272,4 @@ margin-top: 30px; width: 940px; } - \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.build_check.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.build_check.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.build_check.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Check Device Build Info' | T}}

    +
    {{ 'Check Device Build Info' | T}}
    @@ -47,4 +47,4 @@ .modal-dialog { width: 800px; } - \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.license.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.license.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device/modal/device.license.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'License Status' | T}} - {{ license.deviceName }}

    +
    {{ 'License Status' | T}} - {{ license.deviceName }}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.html (working copy) @@ -1,16 +1,17 @@ -
    -
    - - - +
    +
    +
    +
    + {{ 'Device Group' | T }} +
    + ng-click="table.refresh()"> + class="fa fa-plus-circle an-tab-icon">
    @@ -21,9 +22,11 @@
    No.{{'Name'|T}}{{'Managed Devices'|T}}{{'Action'|T}}{{'Name' | T}} + {{'Managed Devices' | T}} + {{'Action' | T}}
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{'No.' | T}}{{'Name' | T}}{{'Description' | T}}{{'Version' | T}}{{'Size' | T}}{{'Last Update Time' | T}}{{'Status' | T}}{{'Available Updates' | T}}{{'Action' | T}}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{row.name}}{{row.description}}{{row.version}} + {{row.size}}{{row.install_date | date: 'yyyy-MM-dd HH:mm:ss' : '+0800'}}{{row.status | T}}{{row.updates}}N/A +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    - {{'Installed Extensions'|T}} - {{'Installed Extensions (edit mode)'|T}} + {{'Available Extensions' | T}}
    -
    +
    - - - - - - + + +
    -
    -
    - {{'Disabled'|T}}: -
    -
    - {{'Enabled'|T}}: -
    -
    - -
    -
    -
    -
    -
    - - - +
    {{each_extension.name}}
    -
    - - - +
    {{each_extension.name}}
    @@ -56,191 +202,124 @@
    -
    +
    +
    + {{ extensionList.available_repo_error | T}} +
    +
    +
    +
    - +
    -
    +
    - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + +
    {{'No.'|T}}{{'Name'|T}}{{'Description'|T}}{{'Version'|T}}{{'Size'|T}}{{'Last Update Time'|T}}{{'Status'|T}}{{'Available Updates'|T}}{{'Action'|T}}
    {{'No.' | T}}{{'Name' | T}}{{'Arch' | T}}{{'Version' | T}}{{'Release' | T}}{{'Size' | T}}{{'Repo' | T}}{{'Summary' | T}}{{'Description' | T}}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{row.name}}{{row.description}}{{row.version}}{{row.size}}{{row.install_date| date : 'yyyy-MM-dd HH:mm:ss' : '+0800'}}{{row.status|T}}{{row.updates}}N/A -
    - - - - -
    -
    {{$index + 1}}{{row.name}}{{row.arch}}{{row.version}}{{row.release}}{{row.size}}{{row.repo}}{{row.summary}}{{row.description}} +
    + +
    +
    -
    +
    -
    +
    -
    -
    -
    -
    - {{'Available Extensions'|T}} -
    -
    -
    - - - -
    -
    -
    -
    -
    -
    -
    -
    - {{each_extension.name}} -
    -
    -
    -
    - {{each_extension.name}} -
    -
    -
    +
    +
    +
    + {{'Update Extensions Manually' | T}} +
    + +
    +
    +
    + +
    +
    -
    - -
    - - {{ extensionList.available_repo_error | T}} - -
    -
    -
    -
    - +
    + +
    +
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{'No.'|T}}{{'Name'|T}}{{'Arch'|T}}{{'Version'|T}}{{'Release'|T}}{{'Size'|T}}{{'Repo'|T}}{{'Summary'|T}}{{'Description'|T}}
    {{$index + 1}}{{row.name}}{{row.arch}}{{row.version}}{{row.release}}{{row.size}}{{row.repo}}{{row.summary}}{{row.description}} -
    - -
    -
    +
    + +
    +
    + + + +
    -
    -
    -
    +
    +
    +
    + +
    - -
    -
    -
    -
    - {{'Update Extensions Manually'|T}} +
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    -
    - - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -     -
    +
    @@ -249,9 +328,11 @@ .panel-body { padding: 10px; } + .btn { padding: 6px 15px; } + .subscribe { margin-bottom: 10px; } @@ -274,19 +355,22 @@ border: 1px dashed #d8d9da; } - .custom-table.table>tbody>tr:nth-of-type(odd) { + .custom-table.table > tbody > tr:nth-of-type(odd) { background-color: transparent; } + .recommend.tile-small { height: 60px; width: 60px; background-color: #e45602; } + .va-cube { border-radius: 5px; text-align: center; padding: 5px; } + .capacity-content { position: relative; top: 50%; @@ -301,8 +385,8 @@ .tile-on span::after { content: "sss"; - background: rgb(126,192,238); - color: rgb(126,192,238); + background: rgb(126, 192, 238); + color: rgb(126, 192, 238); border-radius: 5px; } @@ -313,14 +397,15 @@ .tile-off span::after { content: "sss"; - background-color: rgb(170,170,170); - color: rgb(170,170,170); + background-color: rgb(170, 170, 170); + color: rgb(170, 170, 170); border-radius: 5px; } .input-group-addon { cursor: pointer; } + .preview-content { padding: 10px; line-height: 25px; @@ -334,24 +419,29 @@ .popover.popover-shadow { max-width: 800px; } - .file-box{ + + .file-box { position: relative; - } - .file{ - position: absolute; + } + + .file { + position: absolute; top: 0; opacity: 0; } + .file-box button { position: absolute; top: 0; right: 0; border-radius: 0; } + .form-horizontal .nav-pills { width: 375px; } + .form-horizontal .file-box { width: 370px; } - \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/log/log.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/log/log.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/log/log.html (working copy) @@ -1,46 +1,45 @@ -
    -
    -
    -
    - {{'Extension Log' | T}} -
    -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    No.{{ 'Extension Name' | T }}{{ 'Action' | T }}{{ 'Time' | T }}{{ 'Result' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ row.name }}{{ row.action }}{{ row.time }}{{ row.result}}
    -
    -
    +
    +
    +
    + {{'Extension Log' | T}} +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    No.{{ 'Extension Name' | T }}{{ 'Action' | T }}{{ 'Time' | T }}{{ 'Result' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ row.name }}{{ row.action }}{{ row.time }}{{ row.result}}
    +
    +
    +
    - -
    - \ No newline at end of file +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/base_settings.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/base_settings.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/base_settings.html (working copy) @@ -1,79 +1,100 @@ -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    -
    - -
    - +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + +
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/device_ha_detail.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/device_ha_detail.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/device_ha_detail.html (working copy) @@ -1,29 +1,32 @@ -
    -
    -
    -
    -
    +
    +
    +
    -
    -
    -
    - -
    +
    +
    +
    -
    +
    -
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/ha_group.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/ha_group.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/ha_group.html (working copy) @@ -1,58 +1,65 @@ -
    -
    -
    -
    -
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - -
    No.{{ 'Group ID' | T }}{{ 'HA Group' | T }}{{ 'Preemption Mode' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.id }} -
    - - -
    -     		-
    - - -
    -
    -
    -
    +
    +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    +
    + + + + + + +
    No.{{ 'Group ID' | T }}{{ 'HA Group' | T }}{{ 'Preemption Mode' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.id }} +
    + + +
    +     		+
    + + +
    +
    +
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/ha_unit.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/ha_unit.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/detail/ha_unit.html (working copy) @@ -1,43 +1,45 @@ -
    -
    -
    -
    -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - -
    No.{{ 'Unit Name' | T }}{{ 'Primary Link IP' | T }}{{ 'Primary Link Port' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.name }}{{ item.ip }}{{ item.port }}
    -
    -
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + +
    +
    + + + + + + +
    No.{{ 'Unit Name' | T }}{{ 'Primary Link IP' | T }}{{ 'Primary Link Port' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.name }}{{ item.ip }}{{ item.port }}
    +
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/device_ha.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/device_ha.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/device_ha/device_ha.html (working copy) @@ -1,95 +1,111 @@ -
    -
    -
    -
    -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - -
    No.{{ 'Device Name' | T }}{{ 'HA Status' | T }}{{ 'ARP Interval' | T }}{{ 'Runtime Synconfig' | T }}{{ 'HA Logging' | T }}{{ 'HA Log Level' | T }}{{ 'HA Floating MAC' | T }}{{ 'HA FFO Link' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.device_name }} -
    - - -
    -     		{{ item.arp }} -
    - - -
    -     		-
    - - -
    -     		{{ item.log_level }} -
    - - -
    -     		-
    - - -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + +
    No.{{ 'Device Name' | T }}{{ 'HA Status' | T }}{{ 'ARP Interval' | T }}{{ 'Runtime Synconfig' | T }}{{ 'HA Logging' | T }}{{ 'HA Log Level' | T }}{{ 'HA Floating MAC' | T }}{{ 'HA FFO Link' | T }}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.device_name + }} +
    + + +
    +     		{{ item.arp }} +
    + + +
    +     		+
    + + +
    +     		{{ item.log_level }} +
    + + +
    +     		+
    + + +
    +
    No matching records found.
    +
    +
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/ha.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/ha.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ha/ha.html (working copy) @@ -2,13 +2,13 @@
    -
    +
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/image.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/image.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/image.html (working copy) @@ -2,76 +2,83 @@
    - {{'Device Build' | T}} + {{'Upgrade Center' | T}}
    - - + +
    -
    - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + +
    No.{{ 'Build Name' | T }}{{ 'Version' | T }}{{ 'MD5' | T }}{{ 'File Size' | T }}{{ 'Download Link' | T }}{{ 'Action' | T }}
    - - - -
    No.{{ 'Build Name' | T }}{{ 'Version' | T }}{{ 'MD5' | T }}{{ 'File Size' | T }}{{ 'Download Link' | T }}{{ 'Action' | T }}
    + + + +
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ row.app_name }}{{ row.build_version }}{{ row.md5_value }}{{ row.file_size }}{{ row.download_link }} -
    - - - -
    -
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ row.app_name }}{{ row.build_version }}{{ row.md5_value }}{{ row.file_size }}{{ row.download_link }} +
    + + + +
    +
    -
    -
    +
    +
    -
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-add.html (working copy) @@ -2,7 +2,7 @@
    -

    {{ 'Add New Build' | T}}

    +
    {{ 'Add New Build' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-edit.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-edit.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-edit.html (working copy) @@ -1,7 +1,7 @@
    -

    {{'Edit MD5' | T }}

    +
    {{'Edit MD5' | T }}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-upload.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-upload.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/image-upload.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'Upload Build' | T}}

    +
    {{ 'Upload Build' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/system-update.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/system-update.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/system-update.html (working copy) @@ -1,7 +1,7 @@
    -

    {{ 'System Update' | T}}

    +
    {{ 'System Update' | T}}
    Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/login/login.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/login/login.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/login/login.html (working copy) @@ -1,55 +1,57 @@
    -
    +
    -
    - - - - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/navbar.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/navbar.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/navbar.html (working copy) @@ -1,5 +1,5 @@ @@ -172,22 +187,47 @@
    + html { + overflow-y: auto; + } + + .red-point { + position: relative; + } + .red-point::before { + content: " "; + border: 5px solid red; + border-radius: 10px; + position: absolute; + z-index: 1000; + right: 0; + margin-right: -4px; + margin-top: -1px; + } + + .an-brand { + margin-left: 15px; + font-size: 20px; + font-weight: 500; + color: #1170cf; + } + + .an-product { + font-size: 20px; + font-weight: 300; + color: white; + } + + .an-title { + line-height: 45px; + color: #fff; + margin-left: 15px; + font-size: 16px; + letter-spacing: 1px; + } + + svg:hover path { + fill: #1170cf; + } + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/profile.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/profile.js (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/profile.js (working copy) @@ -2,52 +2,38 @@ .module('cmApp') .constant('CMSettings', { 'app': 'AMP', - 'company_name':[ - { - 'name': 'Beijing Array Networks Co., Ltd.' - }, //first one as company name + //first one as default + 'company_name': [ { 'name': 'Array Networks, Inc.' - } - ], - 'manual':[ - { - 'lang': 'en', - 'link': { - 'user_guide': '/app/app/docs/Array_AMP_User_Guide_3_5_cn.pdf' - } - }, - { - 'lang': 'zh-cn', - 'link': { - 'user_guide': '/app/app/docs/Array_AMP_User_Guide_3_5_cn.pdf' - } }, + ], + 'manual': [ { 'lang': 'en', 'link': { - 'user_guide': '/app/app/docs/Array_AMP_User_Guide_3_2_1_en.pdf' + 'user_guide': '/app/app/docs/AMP_User_Guide_3.7_en.pdf' } }, ], - 'language':[ + 'language': [ { 'name': 'en', 'verbose_name': 'English' - }, //first one as default language + }, { 'name': 'zh-cn', - 'verbose_name': '简体中文' + 'verbose_name': '简体中文' } ], - 'theme':[ - { - 'name': 'dark', - 'verbose_name': 'Dark' - }, //first one as default theme + 'theme': [ { 'name': 'bright', - 'verbose_name': 'Bright' - } + 'verbose_name': 'Bright' + }, + { + 'name': 'dark', + 'verbose_name': 'Dark' + }, ], }); Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/sidebar.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/sidebar.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/sidebar.html (working copy) @@ -1,14 +1,15 @@
      - +
    • - {{ module.title|T }}
        -
      • - +
      • + - {{element.verbose_name|T}} + {{element.verbose_name | T}}
        @@ -17,8 +18,10 @@
        @@ -27,14 +30,15 @@
      • - {{ module.title|T }}
          -
        • - +
        • + - {{element.verbose_name|T}} + {{element.verbose_name | T}}
          @@ -43,8 +47,10 @@
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/sidebar.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/sidebar.js (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/main/sidebar.js (working copy) @@ -10,94 +10,128 @@ icon: 'fa fa-dashboard', name: 'dashboard', verbose_name: 'Dashboard', - ui_url: 'dashboard.overview', + ui_url: 'dashboard.system_statistics', url_prefix: '/dashboard', ui_data: {}, collapse: true, isExpanded: true }, - { - show: true, - icon: 'fa sidebar-device', - name: 'device', - verbose_name: 'Device', - auth_path: ['device'], - ui_url: 'device', - url_prefix: '/device', - ui_data: {}, - collapse: true, - submenu: { - state: true, - list: [ - { - title: 'Device', - auth_path: ['device', 'device'], - sub_ui_url: 'device', - sub_url_prefix: '/device' - }, - { - title: 'Device Group', - auth_path: ['device', 'device_group'], - sub_ui_url: 'device_group', - sub_url_prefix: '/device_group' - } - ] - }, - isExpanded: true - }, - { - show: true, - icon: 'fa sidebar-acm', - name: 'system', - verbose_name: 'System', - auth_path: ['system'], - ui_url: 'system.host', - url_prefix: ['/system', '/storage', '/task', '/admin', '/notification', '/extension'], - ui_data: {}, - collapse: true, - submenu: { - state: true, - list: [ - { - title: 'General Settings', - auth_path: ['system', 'host'], - sub_ui_url: 'system.host', - sub_url_prefix: '/system' - }, - { - title: 'Storage', - auth_path: ['system', 'storage'], - sub_ui_url: 'storage', - sub_url_prefix: '/storage' - }, - { - title: 'Task', - auth_path: ['system', 'task'], - sub_ui_url: 'task', - sub_url_prefix: '/task' - }, - { - title: 'Administrator', - auth_path: ['system', 'admin'], - sub_ui_url: 'admin.userMgmt', - sub_url_prefix: '/admin' - }, - { - title: 'Notification', - auth_path: ['system', 'notification'], - sub_ui_url: 'notification.channel', - sub_url_prefix: '/notification' - }, - { - title: 'Extension', - auth_path: ['system', 'extension'], - sub_ui_url: 'extension.list', - sub_url_prefix: '/extension' - } - ] + { + show: true, + icon: 'fa sidebar-device', + name: 'device', + verbose_name: 'Inventory', + auth_path: ['device'], + ui_url: 'device', + url_prefix: '/device', + ui_data: {}, + collapse: true, + submenu: { + state: true, + list: [ + { + title: 'Device', + auth_path: ['device', 'device'], + sub_ui_url: 'device', + sub_url_prefix: '/device' + }, + { + title: 'Device Group', + auth_path: ['device', 'device_group'], + sub_ui_url: 'device_group', + sub_url_prefix: '/device_group' + } + ] + }, + isExpanded: true }, - isExpanded: true - }] + { + show: true, + icon: 'fa sidebar-acm', + name: 'system', + verbose_name: 'System', + auth_path: ['system'], + ui_url: 'system.host', + url_prefix: ['/system', '/storage', '/task', '/admin', '/notification', '/extension'], + ui_data: {}, + collapse: true, + submenu: { + state: true, + list: [ + { + title: 'General Settings', + auth_path: ['system', 'host'], + sub_ui_url: 'system.host', + sub_url_prefix: '/system' + }, + { + title: 'Storage', + auth_path: ['system', 'storage'], + sub_ui_url: 'storage', + sub_url_prefix: '/storage' + }, + { + title: 'Task', + auth_path: ['system', 'task'], + sub_ui_url: 'task', + sub_url_prefix: '/task' + }, + { + title: 'Administrator', + auth_path: ['system', 'admin'], + sub_ui_url: 'admin.userMgmt', + sub_url_prefix: '/admin' + }, + { + title: 'Notification', + auth_path: ['system', 'notification'], + sub_ui_url: 'notification.channel', + sub_url_prefix: '/notification' + }, + { + title: 'Extension', + auth_path: ['system', 'extension'], + sub_ui_url: 'extension.list', + sub_url_prefix: '/extension' + } + ] + }, + isExpanded: true + }] + }, + { + show: true, + name: 'device services', + title: 'Device services', + elements: [ + { + show: true, + icon: 'fa fa-sitemap', + name: 'device services', + verbose_name: 'Device services', + ui_url: 'ha.device_ha', + url_prefix: ['/ha', '/ssl_monitoring'], + collapse: true, + submenu: { + state: true, + list: [ + { + title: 'HA Management', + auth_path: ['ha'], + sub_ui_url: 'ha.device_ha', + sub_url_prefix: '/ha' + }, + { + title: 'SSL Certificates', + auth_path: ['ssl_monitoring'], + sub_ui_url: 'ssl_monitoring', + sub_url_prefix: '/ssl_monitoring' + } + ] + }, + isExpanded: true + } + ] }, { show: true, @@ -108,7 +142,7 @@ show: true, icon: 'fa sidebar-image', name: 'image', - verbose_name: 'Device Build', + verbose_name: 'Upgrade Center', auth_path: ['image'], ui_url: 'image', url_prefix: '/image', @@ -120,7 +154,7 @@ show: true, icon: 'fa sidebar-config', name: 'configuration', - verbose_name: 'Configuration File', + verbose_name: 'Automation Hub', auth_path: ['configuration'], ui_url: 'configuration.device', url_prefix: '/configuration', @@ -151,30 +185,30 @@ }, isExpanded: true }, - { - show: true, - icon: 'fa fa-retweet', - name: 'ha', - verbose_name: 'HA', - auth_path: ['ha'], - ui_url: 'ha.device_ha', - url_prefix: '/ha', - ui_data: {}, - collapse: true, - isExpanded: true - }, - { - show: true, - icon: 'fa fa-key', - name: 'ssl_monitoring', - verbose_name: 'SSL Certificate', - auth_path: ['ssl_monitoring'], - ui_url: 'ssl_monitoring', - url_prefix: '/ssl_monitoring', - ui_data: {}, - collapse: true, - isExpanded: true - } + // { + // show: true, + // icon: 'fa fa-retweet', + // name: 'ha', + // verbose_name: 'HA', + // auth_path: ['ha'], + // ui_url: 'ha.device_ha', + // url_prefix: '/ha', + // ui_data: {}, + // collapse: true, + // isExpanded: true + // }, + // { + // show: true, + // icon: 'fa fa-key', + // name: 'ssl_monitoring', + // verbose_name: 'SSL Certificate', + // auth_path: ['ssl_monitoring'], + // ui_url: 'ssl_monitoring', + // url_prefix: '/ssl_monitoring', + // ui_data: {}, + // collapse: true, + // isExpanded: true + // } ] } ]); Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/channel/channel.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/channel/channel.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/channel/channel.html (working copy) @@ -1,78 +1,82 @@ -
          -
          -
          -
          - {{ 'Notification Channel' | T }} -
          -
          -
          - - -
          -
          -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          No.{{ 'Channel Name' | T }}{{ 'Channel Type' | T }}{{ 'Default' | T }}{{ 'Action' | T }}
          - - - -
          {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }} - {{ item.name }} - {{ notificationChannel.parseChannelType(item.type) | T}} -
          - -
          -
          - -
          -           		- - - -
          {{ 'You do not have any notification channels.' | T }}
          -
          -
          +
          +
          +
          + {{ 'Notification Channel' | T }} +
          +
          +
          + +
          -
          +
          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          No.{{ 'Channel Name' | T }}{{ 'Channel Type' | T }}{{ 'Default' | T }}{{ 'Action' | T }}
          + + + +
          {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }} + {{ item.name }} + {{ notificationChannel.parseChannelType(item.type) | T}} +
          + +
          +
          + +
          +           		+ + + +
          {{ 'You do not have any notification channels.' | T }}
          +
          +
          +
          +
          -
          \ No newline at end of file +
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/notification.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/notification.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/notification.html (working copy) @@ -2,15 +2,17 @@
          -
          -
          -
          -
          + +
          +
          +
          +
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/mail.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/mail.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/mail.html (working copy) @@ -1,70 +1,66 @@ -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          - - - -
          -
          - - - -
          -
          -
          -
          \ No newline at end of file +
          +
          +
          +
          + +
          + +
          +
          +
          + +
          + +
          +
          +
          + +
          + +
          +
          +
          + +
          + +
          +
          +
          + +
          + +
          +
          +
          + +
          + +
          +
          +
          + +
          + +
          +
          +
          +
          + + +
          +
          +
          +
          +
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/setting.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/setting.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/notification/setting/setting.html (working copy) @@ -1,13 +1,12 @@ -
          -
          - -
          +
          +
          -
          + +
          - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/basic.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/basic.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/basic.html (working copy) @@ -1,156 +1,186 @@ -
          -
          -
          -
          - {{'Real Service' | T}} +
          +
          +
          + {{'Real Service' | T}} +
          + + + + + + + + + + + + +
                + +       + +       + +
          +
          +
          +
          + + + + + +
          - + +
          +
          - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                - -       - -      
          No.{{ 'Service Name' | T }}{{ 'Block' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'IP Address' | T }}{{ 'Port' | T }}{{ 'Enable' | T }}{{ 'UP/DOWN' | T }}{{ 'Group Weight' | T }}{{ 'Max Connection' | T }}{{ 'Up Check' | T }}{{ 'Down Check' | T }}
          + + + + + + + + + +
          + + {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.service_name }} + {{ block }} + {{ item.device.name }} + {{ item.device.device_group }}{{ item.ip }}{{ item.port }} + + + + + + {{ item.upDown }} + +
          + + + + + + + + +
          {{ row.group_name }}{{ row.weight }}
          +
          + +           		{{ item.max_conn }}{{ item.hc_up }}{{ item.hc_down }}
          No matching records found.
          +
          +
          -
          -
          -
          - - - - - -
          -
          -
          -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          No.{{ 'Service Name' | T }}{{ 'Block' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'IP Address' | T }}{{ 'Port' | T }}{{ 'Enable' | T }}{{ 'UP/DOWN' | T }}{{ 'Group Weight' | T }}{{ 'Max Connection' | T }}{{ 'Up Check' | T }}{{ 'Down Check' | T }}
          - - - - - - - - - -
          - - {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.service_name }} - {{ block }} - {{ item.device.name }}{{ item.device.device_group }}{{ item.ip }}{{ item.port }} - - - - - - {{ item.upDown }} - -
          - - - - - - - - -
          {{ row.group_name }}{{ row.weight }}
          -
          - -           		{{ item.max_conn }}{{ item.hc_up }}{{ item.hc_down }}
          -
          -
          -
          -
          +
          @@ -162,4 +192,4 @@ left: 95px; opacity: 0; } - \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/block.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/block.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/block.html (working copy) @@ -1,76 +1,87 @@ -
          -
          -
          -
          - {{'Real Service Block' | T}} -
          -
          -
          - - - - - -
          -
          -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          No.{{ 'Block Name' | T }}{{ 'Real Service' | T }}{{ 'Action' | T }}
          - -
          {{ ((currentBlockPageIndex - 1) * pageSize) + $index + 1 }}{{ item.name }} -
          - - - - - - - -
          {{ key }}{{ value.join(', ') }}
          -
          -           		- - - - - - -
          -
          -
          +
          +
          +
          + {{'Real Service Block' | T}} +
          +
          +
          + + + + +
          -
          +
          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          No.{{ 'Block Name' | T }}{{ 'Real Service' | T }}{{ 'Action' | T }}
          + +
          {{ ((currentBlockPageIndex - 1) * pageSize) + $index + 1 }}{{ item.name }} +
          + + + + + + + +
          {{ key }}{{ value.join(', ') }}
          +
          +           		+ + + + + + +
          No matching records found.
          +
          +
          +
          +
          + \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/real_service.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/real_service.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/real_service/real_service.html (working copy) @@ -1,17 +1,14 @@ -
          -
          - -
          +
          +
          -
          +
          - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/slb_topology.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/slb_topology.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/slb_topology.html (working copy) @@ -2,15 +2,16 @@
          -
          -
          -
          -
          + +
          +
          +
          +
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/virtual_service/virtual_service.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/virtual_service/virtual_service.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/slb_topology/virtual_service/virtual_service.html (working copy) @@ -1,92 +1,122 @@ -
          -
          -
          - - -
          - {{'SLB Topology' | T}} -
          -
          -
          - -
          -
          -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          - - - - - - -
          No.{{ 'Service Name' | T }}{{ 'Type' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'IP Address' | T }} {{'Policy' | T}} {{'Group' | T}} {{'Real Service' | T}}
          - - - - - - - -
          {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.name | E}}{{ item.type }} {{ item.device.name }}{{ item.device.device_group }}{{ item.ip }} - {{ item.policy.name }} - - {{ item.policy.group }} - - {{ item.policy.rs }} - - - - - - - -
          - {{ policy.name }} - - {{ policy.group }} - - {{ policy.rs }} -
          -
          -
          -
          +
          +
          + + +
          + {{'SLB Topology' | T}} +
          +
          +
          +
          +
          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          + + + + + + +
          No.{{ 'Service Name' | T }}{{ 'Type' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'IP Address' | T }} {{'Policy' | T}} {{'Group' | T}} {{'Real Service' | T}}
          + + + + + + + +
          {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.name | E}}{{ item.type }}{{ item.device.name + }}{{ item.device.device_group }}{{ item.ip }} + {{ item.policy.name }} + + {{ item.policy.group }} + + {{ item.policy.rs }} + + + + + + + +
          + {{ policy.name }} + + {{ policy.group }} + + {{ policy.rs }} +
          +
          No matching records found.
          +
          +
          +
          -
          \ No newline at end of file +
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ssl_monitoring/ssl.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ssl_monitoring/ssl.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ssl_monitoring/ssl.html (working copy) @@ -1,66 +1,89 @@ -
          - - -
          - {{'SSL Certificate' | T}} -
          -
          -
          - - +
          +
          +
          +
          + {{'SSL Certificates' | T}} +
          +
          +
          + + +
          +
          + + +
          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          +
          + + + + + + +
          No.{{ 'Service Name' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'Service Type' | T }}{{ 'SSL Host Name' | T }}{{ 'SSL Host Status' | T }}
          + +
          {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }} + {{ row.name }} + {{ row.name + }} + {{ row.device }}{{ row.device_group }}{{ row.type }}{{ row.host }}{{ row.status }} + +
          No matching records found.
          +
          +
          +
          -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          - - - - - - -
          No.{{ 'Service Name' | T }}{{ 'Device Name' | T }}{{ 'Device Group' | T }}{{ 'Service Type' | T }}{{ 'SSL Host Name' | T }}{{ 'SSL Host Status' | T }}
          - -
          {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }} - {{ row.name }} - {{ row.name }} - {{ row.device }}{{ row.device_group }}{{ row.type }}{{ row.host }}{{ row.status }} - -
          -
          -
          -
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ssl_monitoring/ssl_edit.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ssl_monitoring/ssl_edit.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/ssl_monitoring/ssl_edit.html (working copy) @@ -1,7 +1,8 @@
          - -

          {{ 'Edit SSL Service' | T}}

          + +
          {{ 'Edit SSL Service' | T}}
          @@ -35,7 +36,7 @@
          - +
          @@ -66,4 +67,4 @@ .modal-dialog { width: 800px; } - \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/log-location.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/log-location.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/log-location.html (working copy) @@ -1,57 +1,55 @@
          -
          -
          -
          - {{ 'Log Location Configuration' | T }} -
          -
          - - -
          - -
          - -
          - -
          +
          +
          + {{ 'Log Location Configuration' | T }} +
          +
          + + +
          + +
          + +
          +
          -
          -
          -
          - - -
          +
          +
          +
          +
          + +
          - -
          +
          +
          - {{ 'Storage Management' | T }} + {{ 'Storage Management' | T }}
          @@ -94,56 +92,54 @@ + +
          -
          -
          -
          - {{ 'Archived Logs' | T }} -
          +
          +
          + {{ 'Archived Logs' | T }}
          -
          -
          -
          - -
          -
          -
          - - - - - - - - - - - - - - - - - - - -
          No.{{ 'File Name' | T }}{{ 'Action' | T }}
          {{ $index + 1 }}{{ archiveItem }} - -
          -
          -
          -
          -

          No matching records - found.


          +
          +
          + +
          +
          + + + + + + + + + + + + + + + + + + + + +
          No.{{ 'File Name' | T }}{{ 'Action' | T }}
          {{ $index + 1 }}{{ archiveItem }} + +
          +
          +
          +

          No matching records + found.


          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/modal/create-archive.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/modal/create-archive.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/modal/create-archive.html (working copy) @@ -3,7 +3,7 @@ -

          {{ 'Create Archive' | T}}

          +
          {{ 'Create Archive' | T}}
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/modal/unarchive.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/modal/unarchive.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/log-location/modal/unarchive.html (working copy) @@ -3,7 +3,7 @@ -

          {{ 'UnArchive' | T}}

          +
          {{ 'UnArchive' | T}}
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/primary/primary-storage.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/primary/primary-storage.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/storage/primary/primary-storage.html (working copy) @@ -1,125 +1,143 @@
          -
          -
          -
          - {{ 'Storage Clean' | T }} -
          -
          - -
          - -
          - -
          +
          +
          + {{ 'Storage Clean' | T }} +
          +
          + +
          + +
          +
          -
          - -
          - - {{ 'Day' | T}} -
          +
          +
          + +
          + + {{ 'Day' | T}}
          -
          - -
          - - {{ '%' }} -
          +
          +
          + +
          + + {{ '%' }}
          -
          -
          - - - -
          +
          +
          +
          + + +
          - -
          +
          +
          -
          -
          -
          - {{ 'Storage Management' | T }} -
          -
          - - - - - - - - - - - - + + + +
          {{'Module' | T}}{{'Disk Usage' | T}}{{'Disk Size' | T}}
          {{ item.name | T}} -
          -
          -
          -
          +
          +
          + {{ 'Storage Management' | T }} +
          +
          + + + + + + + + + + + + - - - -
          {{'Module' | T}}{{'Disk Usage' | T}}{{'Disk Size' | T}}
          + {{ item.name | T}} +
          +
          +
          -
          - -
          -
          		- {{item.sizeStr}} -
          -
          -
          -
          -
          -
          -
          +
          + +
          +
          		+ {{item.sizeStr}} +
          +
          +
          +
          +
          +
          +
          - - - - - - - - - - - - - - - - - -
          {{'Name' | T}}{{'Description' | T}}{{'Disk Size' | T}}{{'Action' | T}}
          {{ item.name | T}}{{ item.description | T}}{{ item.sizeStr }} - {{'View' | T}} -
          -
          - -
          +
          + + + + + + + + + + + + + + + + + +
          {{'Name' | T}}{{'Description' | T}}{{'Disk Size' | T}}{{'Action' | T}}
          {{ item.name | T}}{{ item.description | T}}{{ item.sizeStr }} + {{'View' | T}} +
          +
          +
          - {{primaryStorage.diskStatusWidget.title}} + {{primaryStorage.diskStatusWidget.title}}
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/task/modal/task_detail_dialog.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/task/modal/task_detail_dialog.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/task/modal/task_detail_dialog.html (working copy) @@ -1,6 +1,6 @@
          -

          {{'Description' | T}}» {{taskDetail.message.name}}

          +
          {{'Description' | T}}» {{taskDetail.message.name}}
          {{taskDetail.message.content}}
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/task/task.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/task/task.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/task/task.html (working copy) @@ -2,12 +2,12 @@
          - {{ 'Managed Task' | T }} + {{ 'Managed Task' | T }}
          - - + +
          - + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/vs/modal/vs.add.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/vs/modal/vs.add.html (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/vs/modal/vs.add.html (working copy) @@ -1,7 +1,7 @@
          -

          {{ 'Add New VS' | T}}

          +
          {{ 'Add New VS' | T}}
          Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/body.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/body.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/body.less (working copy) @@ -3,9 +3,10 @@ } .graph-title { - line-height: 25px; + line-height: 35px; background-color: @table-head; } + .graph .graph-container { background-color: #fff !important; } @@ -19,43 +20,67 @@ border-radius: 4px 4px 0 0; } } + .design-tabs .nav-tabs li a { - padding: 3px 10px; + padding: 3px 10px; } -.nav-pills>li>a { +.nav-pills > li > a { background-color: #f5f5f5; } #canvas_container { background-color: #fff; } + .task-list .widget-body { background-color: #f5f5f5; } + .task-list .widget-body .table tbody tr td a.name { color: #333; } + .task-list .widget-body .table tbody tr td { border-bottom: 1px solid #e8e7e7; } + .form-horizontal { background-color: #fff; } + .modal-header { background-color: @theme-color; } + .modal-footer { background-color: @theme-color; } + .topology-container { .fa-angle-double-right, .fa-angle-double-left { color: #1b3656; } + .border-topology { border: 2px dashed #1b3656; } } + .select-list tr.st-selected { background-color: #d7d7e2 !important -} \ No newline at end of file +} + +.an-tab-icon { + color: #222f31; + font-size: 18px !important; +} + +.an-row-icon { + color: #222f31; + font-size: 16px !important; +} + +.an-row-icon-status { + font-size: 16px !important; +} Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/navbar.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/navbar.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/navbar.less (working copy) @@ -1,5 +1,5 @@ .navbar { - background-color: #3576be; + background-color: #222f31; .navbar-brand { padding: 7px 0; width: 218px; @@ -12,7 +12,7 @@ } } .navbar-brand:hover { - background-color: #165499; + background-color: #165; } span.title { @@ -22,6 +22,13 @@ font-size: 16px; letter-spacing: 1px; } + span.title1 { + line-height: 45px; + color: #fff; + margin-left: 15px; + font-size: 12px; + letter-spacing: 1px; + } .brand-info { display: none; } Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/sidebar.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/sidebar.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/sidebar.less (working copy) @@ -1,51 +1,55 @@ .sidebar { - background-color: @bg; - .module-header { - font-size: 12px; - font-weight: 700; - line-height: 30px; - - color: @black-transparent; - } - .module-body { - li { - &:first-child { - border-top: 1px solid @bg-active; - } - a { - color: @white-dark; - border-bottom: 1px solid @bg-active; - } - + background-color: #222f31; + + .module-header { + font-size: 12px; + font-weight: 700; + line-height: 30px; + color: @black-transparent; + } + + .module-body { + li { + &:first-child { + border-top: 1px solid @bg-active; + } + + a { + color: @white-dark; + border-bottom: 1px solid @bg-active; + } + &.has-submenu.active, &.has-submenu.active > span > a { background-color: transparent; - //color: @white-dark; - color: #ff8c00; + color: @white-dark; + //color: #ff8c00; } - &.active { - a { - background-color: @bg-active; - color: @active; - } - } - } - } + + &.active { + a { + background-color: @bg-active; + color: @active; + } + } + } + } } .sidebar .module-body li.active .submenu a { color: #cdcdcd; background-color: #24323e; + font-weight: 300; } + .sidebar .module-body li.active .submenu li.active a { - color: #ff8c00; + color: #1170cf; background-color: #202b33; + font-weight: 400; } - - -#sidebarToggle { - color: @white; +#sidebarToggle { + color: @white; } Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/variables.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/variables.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/ComposerUI/global/variables.less (working copy) @@ -15,7 +15,7 @@ @warning: #febe30; @correct: #36cd40; -@active: #ff8c00; +@active: #1170cf; @active-light: #66afe9; @active-dark: #337ab7; @@ -32,7 +32,7 @@ @theme-color-font: #333; @theme-color-icon: #555; -@theme-color-active: #228ad6; +@theme-color-active: #1170cf; @theme-color-active-light: #66afe9; @theme-color-active-dark: #337ab7; @theme-color-default: #f9f9f9; Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/custom/global.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/custom/global.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/custom/global.less (working copy) @@ -7,10 +7,14 @@ } .row { - margin-right: -15px !important; + margin-right: -15px !important; margin-left: -15px !important; + div { + margin-bottom: 1px !important; + } } -html,body { + +html, body { background-color: #efeff4 !important; } @@ -20,21 +24,36 @@ } } -.navbar.page-nav{ +.navbar.page-nav { border-top: none; border-bottom-color: #ddd; } .page-nav { - padding-left:240px; - margin-bottom:15px; + padding-left: 218px; + margin-bottom: 15px; } + .page-nav .navbar-content .btn-link { padding: 3px 12px; font-size: 18px; } + .navbar-title i { margin-right: 10px; font-size: large; } +.tab-header { + font-size: small; + font-weight: 400; +} + +.tab-header-1 { + font-size: small; + font-weight: 400; +} + +th { + font-weight: 400 !important; +} Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/custom/tables.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/custom/tables.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/blue/less/custom/tables.less (working copy) @@ -14,7 +14,7 @@ .widget { .row >div { - margin-bottom: 0px; + margin-bottom: 0; padding-left: 15px; } .table-toolbar { Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/body.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/body.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/body.less (working copy) @@ -42,7 +42,7 @@ width: 450px; top: 70px; } - + input[type='checkbox'], input[type='file'], input[type='radio'] { @@ -110,13 +110,13 @@ box-shadow: 0 2px 8px rgba(0,0,0,.2); } .slider-selection { - background-color: #228ad6; + background-color: #1170cf; background-image: none; } #main { padding-left: 218px; - padding-top: 60px; + padding-top: 48px; } #main .nav + .container-fluid { margin-top: 15px; @@ -312,7 +312,7 @@ padding-left: 15px; } } - + } .table-container { pre { @@ -366,3 +366,57 @@ width: 35px; } } + +.col-xs-1, +.col-sm-1, +.col-md-1, +.col-lg-1, +.col-xs-2, +.col-sm-2, +.col-md-2, +.col-lg-2, +.col-xs-3, +.col-sm-3, +.col-md-3, +.col-lg-3, +.col-xs-4, +.col-sm-4, +.col-md-4, +.col-lg-4, +.col-xs-5, +.col-sm-5, +.col-md-5, +.col-lg-5, +.col-xs-6, +.col-sm-6, +.col-md-6, +.col-lg-6, +.col-xs-7, +.col-sm-7, +.col-md-7, +.col-lg-7, +.col-xs-8, +.col-sm-8, +.col-md-8, +.col-lg-8, +.col-xs-9, +.col-sm-9, +.col-md-9, +.col-lg-9, +.col-xs-10, +.col-sm-10, +.col-md-10, +.col-lg-10, +.col-xs-11, +.col-sm-11, +.col-md-11, +.col-lg-11, +.col-xs-12, +.col-sm-12, +.col-md-12, +.col-lg-12 { + position: relative; + min-height: 1px; + padding-left: 1px; + padding-right: 1px; +} Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/login.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/login.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/login.less (working copy) @@ -31,17 +31,19 @@ margin-top: 35px; text-align: center; img { - width: 50px; + height: 45px; + width: 150px; } } .login-text1 { padding-left: 15px; margin-top: 35px; line-height: 35px; - font-size: 30px; + font-size: 21px; font-weight: 400; color: #fff; letter-spacing: 1px; + text-align: center; } .login-text2 { margin-top: 25px; @@ -79,12 +81,12 @@ padding-left: 40px; } } - + button.btn-primary { background-color: #2960b0; border-color: #2960b0 } - + } @@ -97,9 +99,9 @@ right: 0; } } - + } -} +} @@ -112,4 +114,4 @@ .fa-arraylock { background-image: url(../images/loggin-icon-passwd.png); background-size: 100%; -} \ No newline at end of file +} Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/maincontent.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/maincontent.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/maincontent.less (working copy) @@ -5,9 +5,11 @@ border: 1px solid @border; background-color: @white-transparent-dark; + &.ui-sortable-helper { background-color: @bg; } + .file-icon { line-height: 44px; @@ -15,6 +17,7 @@ text-align: center; } + .control-icon { line-height: 44px; @@ -24,9 +27,11 @@ background-color: @border; } + .drag-icon { float: right; } + .remove-icon { position: absolute; top: -1px; @@ -40,7 +45,10 @@ } } } + .modal-footer { + padding: 2px; + .btn { &.btn-default { /*float: left;*/ @@ -57,9 +65,11 @@ width: 100% !important; margin: 0; + .modal-content { height: 100%; } + .modal-body { position: absolute; top: 43px; @@ -70,3 +80,7 @@ max-height: none !important; } } + +.modal-header { + padding: 6px; +} Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/navbar.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/navbar.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/navbar.less (working copy) @@ -1,6 +1,6 @@ .navbar { position: fixed; - height: 45px; + //height: 45px; min-height: 45px; margin: 0; padding: 0; @@ -14,9 +14,7 @@ border-radius: 0; .navbar-title { line-height: 50px; - margin: 0; - color: @theme-color-font; } .navbar-brand { @@ -102,7 +100,7 @@ } } .navbar { - background-color: #3576be; + background-color: #222f31; .navbar-brand { padding: 7px 0; width: 218px; @@ -115,7 +113,7 @@ } } .navbar-brand:hover { - background-color: #165499; + background-color: #165; } span.title { Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/sidebar.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/sidebar.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/sidebar.less (working copy) @@ -115,7 +115,7 @@ } } -#sidebarToggle { +#sidebarToggle { font-size: 18px; cursor: pointer; padding: 15px; @@ -125,12 +125,12 @@ margin-left: 168px; } } -.body-collapsed { - #sidebarToggle { +.body-collapsed { + #sidebarToggle { margin-left: 0; transform: rotate(180deg); } .sidebar>li { margin-bottom: 20px; } -} \ No newline at end of file +} Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/variables.less =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/variables.less (revision 2492) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/styles/general/ComposerUI/global/variables.less (working copy) @@ -15,7 +15,7 @@ @warning: #febe30; @correct: #36cd40; -@active: #ff8c00; +@active: #1170cf; @active-light: #66afe9; @active-dark: #337ab7; @@ -32,7 +32,7 @@ @theme-color-font: #333; @theme-color-icon: #555; -@theme-color-active: #228ad6; +@theme-color-active: #1170cf; @theme-color-active-light: #66afe9; @theme-color-active-dark: #337ab7; @theme-color-default: #f9f9f9; Index: /branches/amp_3_7/tools/requirements.txt =================================================================== --- /branches/amp_3_7/tools/requirements.txt (revision 0) +++ /branches/amp_3_7/tools/requirements.txt (working copy) @@ -0,0 +1,45 @@ +APScheduler==3.3.1 +backports.ssl-match-hostname==3.5.0.1 +configobj==4.7.2 +decorator==3.4.0 +Django==1.5.12 +django-revproxy==0.10.0 +elasticsearch==6.0.0 +flup==1.0.2 +funcsigs==1.0.2 +futures==3.1.1 +influxdb==5.3.1 +iniparse==0.4 +ipaddress==1.0.16 +javapackages==1.0.0 +Jinja2==2.7.2 +lxml==3.2.1 +M2Crypto==0.25.1 +MarkupSafe==0.11 +msgpack==1.0.4 +perf==0.1 +Pillow==4.0.0 +psutil==5.0.0 +psycopg2==2.7.5 +pycurl==7.19.0 +pyftpdlib==1.5.2 +pygobject==3.22.0 +pygpgme==0.3 +pyliblzma==0.5.3 +python-linux-procfs==0.4.9 +pytz==2017.2 +pyudev==0.15 +pyxattr==0.5.1 +reportlab==3.4.0 +requests==2.13.0 +schedule==0.6.0 +schedutils==0.4 +six==1.10.0 +slip==0.4.0 +slip.dbus==0.4.0 +tftpy==0.6.2 +tzlocal==1.4 +urlgrabber==3.10 +urllib3==1.22 +Whoosh==2.7.4 +yum-metadata-parser==1.1.4