diff --git a/bin/combineMinifyWMStats.py b/bin/combineMinifyWMStats.py index 3be2bdcdda..c261d56f32 100644 --- a/bin/combineMinifyWMStats.py +++ b/bin/combineMinifyWMStats.py @@ -26,28 +26,30 @@ t1_dataStruct = ["DataStruct/T1/WMStats.RequestSummary.js", "DataStruct/T1/WMStats.CampaignSummary.js", "DataStruct/T1/WMStats.CMSSWSummary.js", + "DataStruct/T1/WMStats.AgentRequestSummary.js", "DataStruct/T1/WMStats.ReqMgrRequest.js"] + # tier0 specific library t0_dataStruct = ["DataStruct/T0/WMStats.RequestSummary.js", "DataStruct/T0/WMStats.RunSummary.js"] -# analysis specific library -an_dataStruct = ["DataStruct/T1/WMStats.RequestSummary.js", - "DataStruct/T1/WMStats.CampaignSummary.js", - "DataStruct/Analysis/WMStats.UserSummary.js"] +viewModel = ["ViewModels/WMStats.ViewModel.js"] -views = ["Views/Controls/WMStats.CommonControls.js", +views = ["Views/WMStats.CategoryMap.js", + "Views/WMStats.View.IndexHTML.js", + "Views/Controls/WMStats.CommonControls.js", "Views/Tables/WMStats.Table.js", "Views/Tables/WMStats.JobSummaryTable.js", "Views/Tables/WMStats.SiteSummaryTable.js", "Views/Tables/WMStats.WorkloadSummaryTable.js", + "Views/Tables/WMStats.TableController.js", "Views/HTMLList/WMStats.JobDetailList.js", - "Views/HTMLList/WMStats.AgentStatusGUI.js", "Views/HTMLList/WMStats.AgentDetailList.js", "Views/HTMLList/WMStats.CategoryTitle.js", "Views/HTMLList/WMStats.RequestTitle.js", - "Views/Graphs/WMStats.SiteHistoryGraph.js"] + "Views/Graphs/WMStats.SiteHistoryGraph.js" + ] # tier1 specific library t1_views = ["Views/Controls/T1/WMStats.Controls.js", @@ -55,6 +57,8 @@ "Views/Tables/T1/WMStats.ActiveRequestTableWithJob.js", "Views/Tables/T1/WMStats.CampaignSummaryTable.js", "Views/Tables/T1/WMStats.CMSSWSummaryTable.js", + "Views/Tables/T1/WMStats.AgentRequestSummaryTable.js", + "Views/Tables/T1/addCategoryMap.js", "Views/HTMLList/T1/WMStats.RequestDetailList.js", "Views/HTMLList/T1/WMStats.RequestAlertGUI.js", "Views/HTMLList/T1/WMStats.CategoryDetailList.js", @@ -66,23 +70,13 @@ t0_views = ["Views/Controls/T0/WMStats.Controls.js", "Views/Tables/T0/WMStats.ActiveRequestTable.js", "Views/Tables/T0/WMStats.RunSummaryTable.js", + "Views/Tables/T0/addCategoryMap.js", "Views/HTMLList/T0/WMStats.RequestDetailList.js", "Views/HTMLList/T0/WMStats.RequestAlertGUI.js", "Views/HTMLList/T0/WMStats.CategoryDetailList.js", "Views/HTMLList/T0/WMStats.RequestSummaryList.js", "Views/HTMLList/T0/WMStats.RequestDataList.js"] -# tier1 specific library -an_views = ["Views/Controls/Analysis/WMStats.Controls.js", - "Views/Tables/T1/WMStats.ActiveRequestTable.js", - "Views/Tables/T1/WMStats.CampaignSummaryTable.js", - "Views/Tables/Analysis/WMStats.UserSummaryTable.js", - "Views/HTMLList/Analysis/WMStats.RequestDetailList.js", - "Views/HTMLList/Analysis/WMStats.CategoryDetailList.js", - "Views/HTMLList/T1/WMStats.RequestAlertGUI.js", - "Views/HTMLList/T1/WMStats.RequestSummaryList.js", - "Views/HTMLList/T1/WMStats.RequestDataList.js"] - models =["Models/WMStats._ModelBase.js", "Models/WMStats._RequestModelBase.js", "Models/WMStats.JobSummaryModel.js", @@ -97,18 +91,11 @@ t0_models =["Models/T0/WMStats.ActiveRequestModel.js"] -an_models =["Models/T1/WMStats.ActiveRequestModel.js"] -controller = ["Controller/WMStats.Env.js", - "Controller/WMStats.GenericController.js", +controller = ["Controller/WMStats.GenericController.js", "Controller/WMStats.ActiveRequestController.js", - "Controller/WMStats.CategoryMap.js", - "Controller/WMStats.TableController.js", "Controller/WMStats.WorkloadSummaryController.js"] -t1_controller = ["Controller/T1/addCategoryMap.js"] -t0_controller = ["Controller/T0/addCategoryMap.js"] -an_controller = ["Controller/Analysis/addCategoryMap.js"] def concatenateFiles(filelist, fileName): destPath = os.path.join(MINIFIED_DIR, fileName) @@ -129,40 +116,29 @@ def concatenateFiles(filelist, fileName): initLoadDest = 'global.min.js' t1Dest = 'import-all-t1.min.js' t0Dest = 'import-all-t0.min.js' - anDest = 'import-all-analysis.min.js' concatenateFiles(globalLib, initLoadDest) t1_lib = [] t1_lib.extend(dataStrunct) t1_lib.extend(t1_dataStruct) + t1_lib.extend(viewModel) t1_lib.extend(views) t1_lib.extend(t1_views) t1_lib.extend(models) t1_lib.extend(t1_models) t1_lib.extend(controller) - t1_lib.extend(t1_controller) concatenateFiles(t1_lib, t1Dest) t0_lib = [] t0_lib.extend(dataStrunct) t0_lib.extend(t0_dataStruct) + t0_lib.extend(viewModel) t0_lib.extend(views) t0_lib.extend(t0_views) t0_lib.extend(models) t0_lib.extend(t0_models) t0_lib.extend(controller) - t0_lib.extend(t0_controller) concatenateFiles(t0_lib, t0Dest) - - an_lib = [] - an_lib.extend(dataStrunct) - an_lib.extend(an_dataStruct) - an_lib.extend(views) - an_lib.extend(an_views) - an_lib.extend(models) - an_lib.extend(an_models) - an_lib.extend(controller) - an_lib.extend(an_controller) - concatenateFiles(an_lib, anDest) + \ No newline at end of file diff --git a/src/couchapps/WMStats/_attachments/css/main_layout.css b/src/couchapps/WMStats/_attachments/css/main_layout.css index 1a17c84670..c32150cbb9 100644 --- a/src/couchapps/WMStats/_attachments/css/main_layout.css +++ b/src/couchapps/WMStats/_attachments/css/main_layout.css @@ -518,7 +518,7 @@ legend { padding: 5px; } -.agent_detail_box { +.agent_detail_box, .request_error_box{ padding: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; diff --git a/src/couchapps/WMStats/_attachments/index.html b/src/couchapps/WMStats/_attachments/index.html index 5cdbdada1a..569a0501d2 100644 --- a/src/couchapps/WMStats/_attachments/index.html +++ b/src/couchapps/WMStats/_attachments/index.html @@ -47,7 +47,6 @@
-