From 627badf87f3f3875500507667b8c5582666b6bd2 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Thu, 12 Jan 2017 13:04:14 +0100 Subject: [PATCH 1/5] renamed .ericaignore to .couchappignore --- couchdb/dashboard/.couchappignore | 1 + couchdb/dashboard/.ericaignore | 1 - couchdb/disk_space/.couchappignore | 1 + couchdb/disk_space/.ericaignore | 1 - couchdb/names/.couchappignore | 1 + couchdb/names/.ericaignore | 1 - couchdb/old_dashboard/.couchappignore | 1 + couchdb/old_dashboard/.ericaignore | 1 - couchdb/releases/.couchappignore | 1 + couchdb/releases/.ericaignore | 1 - couchdb/statistics/.couchappignore | 1 + couchdb/statistics/.ericaignore | 1 - couchdb/summaries/.couchappignore | 1 + couchdb/summaries/.ericaignore | 1 - 14 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 couchdb/dashboard/.couchappignore delete mode 100644 couchdb/dashboard/.ericaignore create mode 100644 couchdb/disk_space/.couchappignore delete mode 100644 couchdb/disk_space/.ericaignore create mode 100644 couchdb/names/.couchappignore delete mode 100644 couchdb/names/.ericaignore create mode 100644 couchdb/old_dashboard/.couchappignore delete mode 100644 couchdb/old_dashboard/.ericaignore create mode 100644 couchdb/releases/.couchappignore delete mode 100644 couchdb/releases/.ericaignore create mode 100644 couchdb/statistics/.couchappignore delete mode 100644 couchdb/statistics/.ericaignore create mode 100644 couchdb/summaries/.couchappignore delete mode 100644 couchdb/summaries/.ericaignore diff --git a/couchdb/dashboard/.couchappignore b/couchdb/dashboard/.couchappignore new file mode 100644 index 00000000..313be6b6 --- /dev/null +++ b/couchdb/dashboard/.couchappignore @@ -0,0 +1 @@ +[".couchapprc", ".gitignore"] diff --git a/couchdb/dashboard/.ericaignore b/couchdb/dashboard/.ericaignore deleted file mode 100644 index 3e79a9e5..00000000 --- a/couchdb/dashboard/.ericaignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc"] diff --git a/couchdb/disk_space/.couchappignore b/couchdb/disk_space/.couchappignore new file mode 100644 index 00000000..313be6b6 --- /dev/null +++ b/couchdb/disk_space/.couchappignore @@ -0,0 +1 @@ +[".couchapprc", ".gitignore"] diff --git a/couchdb/disk_space/.ericaignore b/couchdb/disk_space/.ericaignore deleted file mode 100644 index 3e79a9e5..00000000 --- a/couchdb/disk_space/.ericaignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc"] diff --git a/couchdb/names/.couchappignore b/couchdb/names/.couchappignore new file mode 100644 index 00000000..313be6b6 --- /dev/null +++ b/couchdb/names/.couchappignore @@ -0,0 +1 @@ +[".couchapprc", ".gitignore"] diff --git a/couchdb/names/.ericaignore b/couchdb/names/.ericaignore deleted file mode 100644 index 3e79a9e5..00000000 --- a/couchdb/names/.ericaignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc"] diff --git a/couchdb/old_dashboard/.couchappignore b/couchdb/old_dashboard/.couchappignore new file mode 100644 index 00000000..313be6b6 --- /dev/null +++ b/couchdb/old_dashboard/.couchappignore @@ -0,0 +1 @@ +[".couchapprc", ".gitignore"] diff --git a/couchdb/old_dashboard/.ericaignore b/couchdb/old_dashboard/.ericaignore deleted file mode 100644 index 3e79a9e5..00000000 --- a/couchdb/old_dashboard/.ericaignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc"] diff --git a/couchdb/releases/.couchappignore b/couchdb/releases/.couchappignore new file mode 100644 index 00000000..313be6b6 --- /dev/null +++ b/couchdb/releases/.couchappignore @@ -0,0 +1 @@ +[".couchapprc", ".gitignore"] diff --git a/couchdb/releases/.ericaignore b/couchdb/releases/.ericaignore deleted file mode 100644 index 3e79a9e5..00000000 --- a/couchdb/releases/.ericaignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc"] diff --git a/couchdb/statistics/.couchappignore b/couchdb/statistics/.couchappignore new file mode 100644 index 00000000..313be6b6 --- /dev/null +++ b/couchdb/statistics/.couchappignore @@ -0,0 +1 @@ +[".couchapprc", ".gitignore"] diff --git a/couchdb/statistics/.ericaignore b/couchdb/statistics/.ericaignore deleted file mode 100644 index ec36718a..00000000 --- a/couchdb/statistics/.ericaignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc", ".empty"] diff --git a/couchdb/summaries/.couchappignore b/couchdb/summaries/.couchappignore new file mode 100644 index 00000000..313be6b6 --- /dev/null +++ b/couchdb/summaries/.couchappignore @@ -0,0 +1 @@ +[".couchapprc", ".gitignore"] diff --git a/couchdb/summaries/.ericaignore b/couchdb/summaries/.ericaignore deleted file mode 100644 index 3e79a9e5..00000000 --- a/couchdb/summaries/.ericaignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc"] -- GitLab From 50dbe8c3c05452fe241af652f181d464bd34adfd Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Thu, 12 Jan 2017 14:05:14 +0100 Subject: [PATCH 2/5] reformatted dashboard erica web app to couchapp --- .../dashboard/{ => _attachments}/css/dashboard.css | 0 .../css/lhcb-theme/images/animated-overlay.gif | Bin .../images/ui-bg_flat_55_999999_40x100.png | Bin .../images/ui-bg_flat_75_aaaaaa_40x100.png | Bin .../images/ui-bg_glass_45_006db6_1x400.png | Bin .../images/ui-bg_glass_55_4ef8f4_1x400.png | Bin .../images/ui-bg_glass_75_daf1fb_1x400.png | Bin .../images/ui-bg_gloss-wave_45_e1231c_500x100.png | Bin .../images/ui-bg_gloss-wave_50_28abfb_500x100.png | Bin .../images/ui-bg_gloss-wave_75_2191c0_500x100.png | Bin .../images/ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin .../lhcb-theme/images/ui-icons_0078ae_256x240.png | Bin .../lhcb-theme/images/ui-icons_056b93_256x240.png | Bin .../lhcb-theme/images/ui-icons_2e9a18_256x240.png | Bin .../lhcb-theme/images/ui-icons_3535cb_256x240.png | Bin .../lhcb-theme/images/ui-icons_d8e7f3_256x240.png | Bin .../lhcb-theme/images/ui-icons_e0fdff_256x240.png | Bin .../lhcb-theme/images/ui-icons_fcd113_256x240.png | Bin .../css/lhcb-theme/jquery-ui-1.11.4.custom.min.css | 0 couchdb/dashboard/{ => _attachments}/css/lhcb.css | 0 .../dashboard/{ => _attachments}/css/rssform.css | 0 .../{ => _attachments}/images/ajax-loader.gif | Bin .../dashboard/{ => _attachments}/images/bg_body.jpg | Bin .../{ => _attachments}/images/bg_content.png | Bin .../dashboard/{ => _attachments}/images/cmake.png | Bin couchdb/dashboard/{ => _attachments}/images/cmt.png | Bin .../{ => _attachments}/images/exclamation.png | Bin .../images/graphix-folder_283x283.png | Bin .../{ => _attachments}/images/jenkins_16.png | Bin .../{ => _attachments}/images/kibana_16.png | Bin .../{ => _attachments}/images/lhcb_logo.png | Bin .../{ => _attachments}/images/lhcb_logo_icon.png | Bin couchdb/dashboard/{ => _attachments}/images/rss.png | Bin couchdb/dashboard/{ => _attachments}/index.html | 0 .../{ => _attachments}/js/jquery-2.1.4.min.js | 0 .../js/jquery-ui-1.11.4.custom.min.js | 0 .../{ => _attachments}/js/jquery.cookie.js | 0 couchdb/dashboard/{ => _attachments}/js/main.js | 0 .../js/moment-timezone-with-data-2010-2020.js | 0 .../dashboard/{ => _attachments}/js/moment.min.js | 0 couchdb/dashboard/{ => _attachments}/js/rssform.js | 0 .../dashboard/{ => _attachments}/systemLoad.html | 0 couchdb/dashboard/_id | 1 + couchdb/dashboard/{app.webapp => couchapp.json} | 0 couchdb/dashboard/{_ddoc => }/lists/diskspacerss.js | 0 .../dashboard/{_ddoc => }/lists/projectBuildIds.js | 0 couchdb/dashboard/{_ddoc => }/lists/summariesrss.js | 0 couchdb/dashboard/{_ddoc => }/rewrites.json | 0 .../dashboard/{_ddoc => }/validate_doc_update.js | 2 +- .../dashboard/{_ddoc => }/views/diskSpace/map.js | 0 .../{_ddoc => }/views/diskSpaceByDate/map.js | 0 .../{_ddoc => }/views/docsBySlotBuild/map.js | 0 .../{_ddoc => }/views/platformsNames/map.js | 0 .../{_ddoc => }/views/platformsNames/reduce.js | 0 .../{_ddoc => }/views/projectBuildIds/map.js | 0 .../{_ddoc => }/views/projectsNames/map.js | 0 .../{_ddoc => }/views/projectsNames/reduce.js | 0 .../dashboard/{_ddoc => }/views/slotsByDay/map.js | 0 .../dashboard/{_ddoc => }/views/slotsNames/map.js | 0 .../{_ddoc => }/views/slotsNames/reduce.js | 0 .../dashboard/{_ddoc => }/views/summaries/map.js | 0 .../{_ddoc => }/views/summariesByDate/map.js | 0 .../dashboard/{_ddoc => }/views/systemLoad/map.js | 0 63 files changed, 2 insertions(+), 1 deletion(-) rename couchdb/dashboard/{ => _attachments}/css/dashboard.css (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/animated-overlay.gif (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_flat_55_999999_40x100.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_flat_75_aaaaaa_40x100.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_glass_45_006db6_1x400.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_glass_55_4ef8f4_1x400.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_glass_75_daf1fb_1x400.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_gloss-wave_45_e1231c_500x100.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_gloss-wave_50_28abfb_500x100.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-icons_0078ae_256x240.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-icons_056b93_256x240.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-icons_2e9a18_256x240.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-icons_3535cb_256x240.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-icons_d8e7f3_256x240.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-icons_e0fdff_256x240.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/images/ui-icons_fcd113_256x240.png (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb-theme/jquery-ui-1.11.4.custom.min.css (100%) rename couchdb/dashboard/{ => _attachments}/css/lhcb.css (100%) rename couchdb/dashboard/{ => _attachments}/css/rssform.css (100%) rename couchdb/dashboard/{ => _attachments}/images/ajax-loader.gif (100%) rename couchdb/dashboard/{ => _attachments}/images/bg_body.jpg (100%) rename couchdb/dashboard/{ => _attachments}/images/bg_content.png (100%) rename couchdb/dashboard/{ => _attachments}/images/cmake.png (100%) rename couchdb/dashboard/{ => _attachments}/images/cmt.png (100%) rename couchdb/dashboard/{ => _attachments}/images/exclamation.png (100%) rename couchdb/dashboard/{ => _attachments}/images/graphix-folder_283x283.png (100%) rename couchdb/dashboard/{ => _attachments}/images/jenkins_16.png (100%) rename couchdb/dashboard/{ => _attachments}/images/kibana_16.png (100%) rename couchdb/dashboard/{ => _attachments}/images/lhcb_logo.png (100%) rename couchdb/dashboard/{ => _attachments}/images/lhcb_logo_icon.png (100%) rename couchdb/dashboard/{ => _attachments}/images/rss.png (100%) rename couchdb/dashboard/{ => _attachments}/index.html (100%) rename couchdb/dashboard/{ => _attachments}/js/jquery-2.1.4.min.js (100%) rename couchdb/dashboard/{ => _attachments}/js/jquery-ui-1.11.4.custom.min.js (100%) rename couchdb/dashboard/{ => _attachments}/js/jquery.cookie.js (100%) rename couchdb/dashboard/{ => _attachments}/js/main.js (100%) rename couchdb/dashboard/{ => _attachments}/js/moment-timezone-with-data-2010-2020.js (100%) rename couchdb/dashboard/{ => _attachments}/js/moment.min.js (100%) rename couchdb/dashboard/{ => _attachments}/js/rssform.js (100%) rename couchdb/dashboard/{ => _attachments}/systemLoad.html (100%) create mode 100644 couchdb/dashboard/_id rename couchdb/dashboard/{app.webapp => couchapp.json} (100%) rename couchdb/dashboard/{_ddoc => }/lists/diskspacerss.js (100%) rename couchdb/dashboard/{_ddoc => }/lists/projectBuildIds.js (100%) rename couchdb/dashboard/{_ddoc => }/lists/summariesrss.js (100%) rename couchdb/dashboard/{_ddoc => }/rewrites.json (100%) rename couchdb/dashboard/{_ddoc => }/validate_doc_update.js (96%) rename couchdb/dashboard/{_ddoc => }/views/diskSpace/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/diskSpaceByDate/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/docsBySlotBuild/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/platformsNames/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/platformsNames/reduce.js (100%) rename couchdb/dashboard/{_ddoc => }/views/projectBuildIds/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/projectsNames/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/projectsNames/reduce.js (100%) rename couchdb/dashboard/{_ddoc => }/views/slotsByDay/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/slotsNames/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/slotsNames/reduce.js (100%) rename couchdb/dashboard/{_ddoc => }/views/summaries/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/summariesByDate/map.js (100%) rename couchdb/dashboard/{_ddoc => }/views/systemLoad/map.js (100%) diff --git a/couchdb/dashboard/css/dashboard.css b/couchdb/dashboard/_attachments/css/dashboard.css similarity index 100% rename from couchdb/dashboard/css/dashboard.css rename to couchdb/dashboard/_attachments/css/dashboard.css diff --git a/couchdb/dashboard/css/lhcb-theme/images/animated-overlay.gif b/couchdb/dashboard/_attachments/css/lhcb-theme/images/animated-overlay.gif similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/animated-overlay.gif rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/animated-overlay.gif diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_flat_55_999999_40x100.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_flat_55_999999_40x100.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_flat_55_999999_40x100.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_flat_55_999999_40x100.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_flat_75_aaaaaa_40x100.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_flat_75_aaaaaa_40x100.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_flat_75_aaaaaa_40x100.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_flat_75_aaaaaa_40x100.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_glass_45_006db6_1x400.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_glass_45_006db6_1x400.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_glass_45_006db6_1x400.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_glass_45_006db6_1x400.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_glass_55_4ef8f4_1x400.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_glass_55_4ef8f4_1x400.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_glass_55_4ef8f4_1x400.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_glass_55_4ef8f4_1x400.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_glass_75_daf1fb_1x400.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_glass_75_daf1fb_1x400.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_glass_75_daf1fb_1x400.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_glass_75_daf1fb_1x400.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_gloss-wave_45_e1231c_500x100.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_gloss-wave_45_e1231c_500x100.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_gloss-wave_45_e1231c_500x100.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_gloss-wave_45_e1231c_500x100.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_gloss-wave_50_28abfb_500x100.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_gloss-wave_50_28abfb_500x100.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_gloss-wave_50_28abfb_500x100.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_gloss-wave_50_28abfb_500x100.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-icons_0078ae_256x240.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_0078ae_256x240.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-icons_0078ae_256x240.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_0078ae_256x240.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-icons_056b93_256x240.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_056b93_256x240.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-icons_056b93_256x240.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_056b93_256x240.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-icons_2e9a18_256x240.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_2e9a18_256x240.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-icons_2e9a18_256x240.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_2e9a18_256x240.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-icons_3535cb_256x240.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_3535cb_256x240.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-icons_3535cb_256x240.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_3535cb_256x240.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-icons_d8e7f3_256x240.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_d8e7f3_256x240.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-icons_d8e7f3_256x240.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_d8e7f3_256x240.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-icons_e0fdff_256x240.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_e0fdff_256x240.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-icons_e0fdff_256x240.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_e0fdff_256x240.png diff --git a/couchdb/dashboard/css/lhcb-theme/images/ui-icons_fcd113_256x240.png b/couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_fcd113_256x240.png similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/images/ui-icons_fcd113_256x240.png rename to couchdb/dashboard/_attachments/css/lhcb-theme/images/ui-icons_fcd113_256x240.png diff --git a/couchdb/dashboard/css/lhcb-theme/jquery-ui-1.11.4.custom.min.css b/couchdb/dashboard/_attachments/css/lhcb-theme/jquery-ui-1.11.4.custom.min.css similarity index 100% rename from couchdb/dashboard/css/lhcb-theme/jquery-ui-1.11.4.custom.min.css rename to couchdb/dashboard/_attachments/css/lhcb-theme/jquery-ui-1.11.4.custom.min.css diff --git a/couchdb/dashboard/css/lhcb.css b/couchdb/dashboard/_attachments/css/lhcb.css similarity index 100% rename from couchdb/dashboard/css/lhcb.css rename to couchdb/dashboard/_attachments/css/lhcb.css diff --git a/couchdb/dashboard/css/rssform.css b/couchdb/dashboard/_attachments/css/rssform.css similarity index 100% rename from couchdb/dashboard/css/rssform.css rename to couchdb/dashboard/_attachments/css/rssform.css diff --git a/couchdb/dashboard/images/ajax-loader.gif b/couchdb/dashboard/_attachments/images/ajax-loader.gif similarity index 100% rename from couchdb/dashboard/images/ajax-loader.gif rename to couchdb/dashboard/_attachments/images/ajax-loader.gif diff --git a/couchdb/dashboard/images/bg_body.jpg b/couchdb/dashboard/_attachments/images/bg_body.jpg similarity index 100% rename from couchdb/dashboard/images/bg_body.jpg rename to couchdb/dashboard/_attachments/images/bg_body.jpg diff --git a/couchdb/dashboard/images/bg_content.png b/couchdb/dashboard/_attachments/images/bg_content.png similarity index 100% rename from couchdb/dashboard/images/bg_content.png rename to couchdb/dashboard/_attachments/images/bg_content.png diff --git a/couchdb/dashboard/images/cmake.png b/couchdb/dashboard/_attachments/images/cmake.png similarity index 100% rename from couchdb/dashboard/images/cmake.png rename to couchdb/dashboard/_attachments/images/cmake.png diff --git a/couchdb/dashboard/images/cmt.png b/couchdb/dashboard/_attachments/images/cmt.png similarity index 100% rename from couchdb/dashboard/images/cmt.png rename to couchdb/dashboard/_attachments/images/cmt.png diff --git a/couchdb/dashboard/images/exclamation.png b/couchdb/dashboard/_attachments/images/exclamation.png similarity index 100% rename from couchdb/dashboard/images/exclamation.png rename to couchdb/dashboard/_attachments/images/exclamation.png diff --git a/couchdb/dashboard/images/graphix-folder_283x283.png b/couchdb/dashboard/_attachments/images/graphix-folder_283x283.png similarity index 100% rename from couchdb/dashboard/images/graphix-folder_283x283.png rename to couchdb/dashboard/_attachments/images/graphix-folder_283x283.png diff --git a/couchdb/dashboard/images/jenkins_16.png b/couchdb/dashboard/_attachments/images/jenkins_16.png similarity index 100% rename from couchdb/dashboard/images/jenkins_16.png rename to couchdb/dashboard/_attachments/images/jenkins_16.png diff --git a/couchdb/dashboard/images/kibana_16.png b/couchdb/dashboard/_attachments/images/kibana_16.png similarity index 100% rename from couchdb/dashboard/images/kibana_16.png rename to couchdb/dashboard/_attachments/images/kibana_16.png diff --git a/couchdb/dashboard/images/lhcb_logo.png b/couchdb/dashboard/_attachments/images/lhcb_logo.png similarity index 100% rename from couchdb/dashboard/images/lhcb_logo.png rename to couchdb/dashboard/_attachments/images/lhcb_logo.png diff --git a/couchdb/dashboard/images/lhcb_logo_icon.png b/couchdb/dashboard/_attachments/images/lhcb_logo_icon.png similarity index 100% rename from couchdb/dashboard/images/lhcb_logo_icon.png rename to couchdb/dashboard/_attachments/images/lhcb_logo_icon.png diff --git a/couchdb/dashboard/images/rss.png b/couchdb/dashboard/_attachments/images/rss.png similarity index 100% rename from couchdb/dashboard/images/rss.png rename to couchdb/dashboard/_attachments/images/rss.png diff --git a/couchdb/dashboard/index.html b/couchdb/dashboard/_attachments/index.html similarity index 100% rename from couchdb/dashboard/index.html rename to couchdb/dashboard/_attachments/index.html diff --git a/couchdb/dashboard/js/jquery-2.1.4.min.js b/couchdb/dashboard/_attachments/js/jquery-2.1.4.min.js similarity index 100% rename from couchdb/dashboard/js/jquery-2.1.4.min.js rename to couchdb/dashboard/_attachments/js/jquery-2.1.4.min.js diff --git a/couchdb/dashboard/js/jquery-ui-1.11.4.custom.min.js b/couchdb/dashboard/_attachments/js/jquery-ui-1.11.4.custom.min.js similarity index 100% rename from couchdb/dashboard/js/jquery-ui-1.11.4.custom.min.js rename to couchdb/dashboard/_attachments/js/jquery-ui-1.11.4.custom.min.js diff --git a/couchdb/dashboard/js/jquery.cookie.js b/couchdb/dashboard/_attachments/js/jquery.cookie.js similarity index 100% rename from couchdb/dashboard/js/jquery.cookie.js rename to couchdb/dashboard/_attachments/js/jquery.cookie.js diff --git a/couchdb/dashboard/js/main.js b/couchdb/dashboard/_attachments/js/main.js similarity index 100% rename from couchdb/dashboard/js/main.js rename to couchdb/dashboard/_attachments/js/main.js diff --git a/couchdb/dashboard/js/moment-timezone-with-data-2010-2020.js b/couchdb/dashboard/_attachments/js/moment-timezone-with-data-2010-2020.js similarity index 100% rename from couchdb/dashboard/js/moment-timezone-with-data-2010-2020.js rename to couchdb/dashboard/_attachments/js/moment-timezone-with-data-2010-2020.js diff --git a/couchdb/dashboard/js/moment.min.js b/couchdb/dashboard/_attachments/js/moment.min.js similarity index 100% rename from couchdb/dashboard/js/moment.min.js rename to couchdb/dashboard/_attachments/js/moment.min.js diff --git a/couchdb/dashboard/js/rssform.js b/couchdb/dashboard/_attachments/js/rssform.js similarity index 100% rename from couchdb/dashboard/js/rssform.js rename to couchdb/dashboard/_attachments/js/rssform.js diff --git a/couchdb/dashboard/systemLoad.html b/couchdb/dashboard/_attachments/systemLoad.html similarity index 100% rename from couchdb/dashboard/systemLoad.html rename to couchdb/dashboard/_attachments/systemLoad.html diff --git a/couchdb/dashboard/_id b/couchdb/dashboard/_id new file mode 100644 index 00000000..3dfb8a35 --- /dev/null +++ b/couchdb/dashboard/_id @@ -0,0 +1 @@ +_design/dashboard \ No newline at end of file diff --git a/couchdb/dashboard/app.webapp b/couchdb/dashboard/couchapp.json similarity index 100% rename from couchdb/dashboard/app.webapp rename to couchdb/dashboard/couchapp.json diff --git a/couchdb/dashboard/_ddoc/lists/diskspacerss.js b/couchdb/dashboard/lists/diskspacerss.js similarity index 100% rename from couchdb/dashboard/_ddoc/lists/diskspacerss.js rename to couchdb/dashboard/lists/diskspacerss.js diff --git a/couchdb/dashboard/_ddoc/lists/projectBuildIds.js b/couchdb/dashboard/lists/projectBuildIds.js similarity index 100% rename from couchdb/dashboard/_ddoc/lists/projectBuildIds.js rename to couchdb/dashboard/lists/projectBuildIds.js diff --git a/couchdb/dashboard/_ddoc/lists/summariesrss.js b/couchdb/dashboard/lists/summariesrss.js similarity index 100% rename from couchdb/dashboard/_ddoc/lists/summariesrss.js rename to couchdb/dashboard/lists/summariesrss.js diff --git a/couchdb/dashboard/_ddoc/rewrites.json b/couchdb/dashboard/rewrites.json similarity index 100% rename from couchdb/dashboard/_ddoc/rewrites.json rename to couchdb/dashboard/rewrites.json diff --git a/couchdb/dashboard/_ddoc/validate_doc_update.js b/couchdb/dashboard/validate_doc_update.js similarity index 96% rename from couchdb/dashboard/_ddoc/validate_doc_update.js rename to couchdb/dashboard/validate_doc_update.js index 47286d42..5dbb1bfc 100644 --- a/couchdb/dashboard/_ddoc/validate_doc_update.js +++ b/couchdb/dashboard/validate_doc_update.js @@ -7,7 +7,7 @@ * @param secObj */ -function validate(newDoc, oldDoc, userCtx, secObj) { +function (newDoc, oldDoc, userCtx, secObj) { function validNightlyLog() { return (newDoc && (newDoc.type == "build-result" || newDoc.type == "tests-result" || newDoc.type == "job-start" || newDoc.type == "job-end" || newDoc.type == "slot-config")); } diff --git a/couchdb/dashboard/_ddoc/views/diskSpace/map.js b/couchdb/dashboard/views/diskSpace/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/diskSpace/map.js rename to couchdb/dashboard/views/diskSpace/map.js diff --git a/couchdb/dashboard/_ddoc/views/diskSpaceByDate/map.js b/couchdb/dashboard/views/diskSpaceByDate/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/diskSpaceByDate/map.js rename to couchdb/dashboard/views/diskSpaceByDate/map.js diff --git a/couchdb/dashboard/_ddoc/views/docsBySlotBuild/map.js b/couchdb/dashboard/views/docsBySlotBuild/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/docsBySlotBuild/map.js rename to couchdb/dashboard/views/docsBySlotBuild/map.js diff --git a/couchdb/dashboard/_ddoc/views/platformsNames/map.js b/couchdb/dashboard/views/platformsNames/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/platformsNames/map.js rename to couchdb/dashboard/views/platformsNames/map.js diff --git a/couchdb/dashboard/_ddoc/views/platformsNames/reduce.js b/couchdb/dashboard/views/platformsNames/reduce.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/platformsNames/reduce.js rename to couchdb/dashboard/views/platformsNames/reduce.js diff --git a/couchdb/dashboard/_ddoc/views/projectBuildIds/map.js b/couchdb/dashboard/views/projectBuildIds/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/projectBuildIds/map.js rename to couchdb/dashboard/views/projectBuildIds/map.js diff --git a/couchdb/dashboard/_ddoc/views/projectsNames/map.js b/couchdb/dashboard/views/projectsNames/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/projectsNames/map.js rename to couchdb/dashboard/views/projectsNames/map.js diff --git a/couchdb/dashboard/_ddoc/views/projectsNames/reduce.js b/couchdb/dashboard/views/projectsNames/reduce.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/projectsNames/reduce.js rename to couchdb/dashboard/views/projectsNames/reduce.js diff --git a/couchdb/dashboard/_ddoc/views/slotsByDay/map.js b/couchdb/dashboard/views/slotsByDay/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/slotsByDay/map.js rename to couchdb/dashboard/views/slotsByDay/map.js diff --git a/couchdb/dashboard/_ddoc/views/slotsNames/map.js b/couchdb/dashboard/views/slotsNames/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/slotsNames/map.js rename to couchdb/dashboard/views/slotsNames/map.js diff --git a/couchdb/dashboard/_ddoc/views/slotsNames/reduce.js b/couchdb/dashboard/views/slotsNames/reduce.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/slotsNames/reduce.js rename to couchdb/dashboard/views/slotsNames/reduce.js diff --git a/couchdb/dashboard/_ddoc/views/summaries/map.js b/couchdb/dashboard/views/summaries/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/summaries/map.js rename to couchdb/dashboard/views/summaries/map.js diff --git a/couchdb/dashboard/_ddoc/views/summariesByDate/map.js b/couchdb/dashboard/views/summariesByDate/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/summariesByDate/map.js rename to couchdb/dashboard/views/summariesByDate/map.js diff --git a/couchdb/dashboard/_ddoc/views/systemLoad/map.js b/couchdb/dashboard/views/systemLoad/map.js similarity index 100% rename from couchdb/dashboard/_ddoc/views/systemLoad/map.js rename to couchdb/dashboard/views/systemLoad/map.js -- GitLab From 3605bf826276092ad7b3efcfb8cd34019ff0c03c Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Thu, 12 Jan 2017 14:13:59 +0100 Subject: [PATCH 3/5] removed unneeded .couchappignore files --- couchdb/dashboard/.couchappignore | 1 - couchdb/disk_space/.couchappignore | 1 - couchdb/names/.couchappignore | 1 - couchdb/old_dashboard/.couchappignore | 1 - couchdb/releases/.couchappignore | 1 - couchdb/statistics/.couchappignore | 1 - couchdb/summaries/.couchappignore | 1 - 7 files changed, 7 deletions(-) delete mode 100644 couchdb/dashboard/.couchappignore delete mode 100644 couchdb/disk_space/.couchappignore delete mode 100644 couchdb/names/.couchappignore delete mode 100644 couchdb/old_dashboard/.couchappignore delete mode 100644 couchdb/releases/.couchappignore delete mode 100644 couchdb/statistics/.couchappignore delete mode 100644 couchdb/summaries/.couchappignore diff --git a/couchdb/dashboard/.couchappignore b/couchdb/dashboard/.couchappignore deleted file mode 100644 index 313be6b6..00000000 --- a/couchdb/dashboard/.couchappignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc", ".gitignore"] diff --git a/couchdb/disk_space/.couchappignore b/couchdb/disk_space/.couchappignore deleted file mode 100644 index 313be6b6..00000000 --- a/couchdb/disk_space/.couchappignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc", ".gitignore"] diff --git a/couchdb/names/.couchappignore b/couchdb/names/.couchappignore deleted file mode 100644 index 313be6b6..00000000 --- a/couchdb/names/.couchappignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc", ".gitignore"] diff --git a/couchdb/old_dashboard/.couchappignore b/couchdb/old_dashboard/.couchappignore deleted file mode 100644 index 313be6b6..00000000 --- a/couchdb/old_dashboard/.couchappignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc", ".gitignore"] diff --git a/couchdb/releases/.couchappignore b/couchdb/releases/.couchappignore deleted file mode 100644 index 313be6b6..00000000 --- a/couchdb/releases/.couchappignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc", ".gitignore"] diff --git a/couchdb/statistics/.couchappignore b/couchdb/statistics/.couchappignore deleted file mode 100644 index 313be6b6..00000000 --- a/couchdb/statistics/.couchappignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc", ".gitignore"] diff --git a/couchdb/summaries/.couchappignore b/couchdb/summaries/.couchappignore deleted file mode 100644 index 313be6b6..00000000 --- a/couchdb/summaries/.couchappignore +++ /dev/null @@ -1 +0,0 @@ -[".couchapprc", ".gitignore"] -- GitLab From d23ca12ada233b381b134b196e86fa7cbaf790f1 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Thu, 12 Jan 2017 14:16:17 +0100 Subject: [PATCH 4/5] minor update of couchapp info --- couchdb/dashboard/couchapp.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/couchdb/dashboard/couchapp.json b/couchdb/dashboard/couchapp.json index f912251c..8c55fa8a 100644 --- a/couchdb/dashboard/couchapp.json +++ b/couchdb/dashboard/couchapp.json @@ -1,17 +1,13 @@ { "name": "LHCb Nightly Builds Summaries", - "version" : "0.0.1", + "version" : "1.0.0", "description": "", "long_description" : "", "launch_path": "/", - "url": "http://git.cern.ch/LbNightlyTools", + "url": "http://gitlab.cern.ch/lhcb-core/LbNightlyTools", "categories": [], - "icons": { - "jenkins": "images/jenkins_16.png", - "lemon": "images/lemon_16.png" - }, "developer": { "name": "Marco Clemencic" }, "default_locale": "en" -} \ No newline at end of file +} -- GitLab From e3d1362b4ee912eb8a5923b819677b207db21dbc Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Thu, 12 Jan 2017 14:29:31 +0100 Subject: [PATCH 5/5] updated README --- couchdb/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchdb/README.md b/couchdb/README.md index 52e5970f..4e3d1bde 100644 --- a/couchdb/README.md +++ b/couchdb/README.md @@ -1,5 +1,5 @@ This directory contains several [CouchApp](http://docs.couchdb.org/en/2.0.0/couchapp/)s -created with [erica](https://github.com/benoitc/erica). +created with [CouchApp](https://pypi.python.org/pypi/Couchapp). Old design documents (to be decommissioned): * **dashboard** _(all flavours)_ -- GitLab