From d5ce3fa3a86f24b08c28c38aa445f75832ff84db Mon Sep 17 00:00:00 2001 From: Julien Jomier Date: Tue, 13 Jan 2026 19:36:19 -0500 Subject: [PATCH 1/6] Remove outdated wiki link --- composer.json | 1 - resources/js/angular/views/index.html | 5 - .../views/partials/filterdataTemplate.html | 4 +- resources/js/vue/components/EditProject.vue | 208 +++--------------- 4 files changed, 37 insertions(+), 181 deletions(-) diff --git a/composer.json b/composer.json index 4f57388587..080246b30a 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,6 @@ "email": "kitware@kitware.com", "issues": "https://github.com/Kitware/CDash/issues", "source": "https://github.com/Kitware/CDash", - "wiki": "http://public.kitware.com/Wiki/CDash" }, "require": { "php": "^8.3", diff --git a/resources/js/angular/views/index.html b/resources/js/angular/views/index.html index b671264f1c..728c219043 100644 --- a/resources/js/angular/views/index.html +++ b/resources/js/angular/views/index.html @@ -39,11 +39,6 @@ Hide Filters -
  • - - Help - -
  • diff --git a/resources/js/angular/views/partials/filterdataTemplate.html b/resources/js/angular/views/partials/filterdataTemplate.html index 81d9c209c0..6297c2ab8b 100644 --- a/resources/js/angular/views/partials/filterdataTemplate.html +++ b/resources/js/angular/views/partials/filterdataTemplate.html @@ -3,8 +3,8 @@
    Help

    Filters

    diff --git a/resources/js/vue/components/EditProject.vue b/resources/js/vue/components/EditProject.vue index 28702a6962..6f2e14ce18 100644 --- a/resources/js/vue/components/EditProject.vue +++ b/resources/js/vue/components/EditProject.vue @@ -312,16 +312,11 @@ {{ type }} - - - @@ -409,16 +404,11 @@ Protected - - - - - - @@ -635,16 +620,11 @@ @change="changeViewerType()" @focus="showHelp('svnViewer_help')" > - - - - - - - - - @@ -815,15 +785,11 @@ @change="cdash.changesmade = true" @focus="showHelp('svnUsername_help')" > - - + > @@ -842,15 +808,11 @@ @change="cdash.changesmade = true" @focus="showHelp('svnPassword_help')" > - - + > @@ -914,16 +876,11 @@ @change="cdash.changesmade = true" @focus="showHelp('TestingDataUrl_help')" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Block List - - -
    @@ -1623,16 +1525,11 @@ > CTestConfig.cmake - - - - - - - - - - - - - - - - - - - - - - - - Date: Tue, 13 Jan 2026 19:36:53 -0500 Subject: [PATCH 2/6] Do not display LATEST link when on the latest page --- app/cdash/public/api/v1/index.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/cdash/public/api/v1/index.php b/app/cdash/public/api/v1/index.php index 604268823a..aa30225989 100644 --- a/app/cdash/public/api/v1/index.php +++ b/app/cdash/public/api/v1/index.php @@ -209,7 +209,17 @@ } else { $base_url = "index.php?project={$projectname_encoded}"; } - $response['menu']['current'] = "$base_url"; + + // Only show 'current' button if we're not already on the current date + // Check if a date was explicitly provided in the URL + $date_specified = isset($_GET['date']); + + if ($date_specified && $response['date'] !== $response['currentdate']) { + $response['menu']['current'] = "$base_url"; + } else { + $response['menu']['current'] = false; + } + $controller->determineNextPrevious($response, $base_url); } $response['childview'] = $controller->childView ? 1 : 0; From b3ce8a8056d0fdd6e80e7d14e3a0379feee4322e Mon Sep 17 00:00:00 2001 From: Julien Jomier Date: Tue, 13 Jan 2026 19:47:58 -0500 Subject: [PATCH 3/6] Moved the view settings to the top menu for more real estate at the top. --- resources/css/common.css | 57 +-------------------- resources/js/angular/views/index.html | 34 ------------ resources/views/components/header.blade.php | 29 +++++++++++ 3 files changed, 31 insertions(+), 89 deletions(-) diff --git a/resources/css/common.css b/resources/css/common.css index 12651abd7b..8e49a7abe3 100644 --- a/resources/css/common.css +++ b/resources/css/common.css @@ -737,6 +737,7 @@ div#headertop { #headermenu #navigation li a:active, #headermenu #navigation li a:visited { color:#666666; + cursor:pointer; display:block; font-size:16px; height:100%; @@ -900,61 +901,7 @@ div#main_content { padding: 1em 2em; } -#settings { - cursor: pointer; - float: right; - height: 20px; - margin-right:0; - margin-top:20px; - position:relative; - width: 20px; -} - -#settings ul{ - -webkit-box-shadow: 0px 20px 27px -2px rgba(0,0,0,0.3); - -moz-box-shadow: 0px 20px 27px -2px rgba(0,0,0,0.3); - box-shadow: 0px 20px 27px -2px rgba(0,0,0,0.3); - list-style: none; - margin:0; - padding:0; - position:absolute; - right:27px; - top:0; - width:130px; - z-index:5000; -} - -#settings ul li { - background:#e0e0e0; - border-bottom:1px solid #bbbbbb; - display: block; - transition:all .15s ease-in-out; -} - -#settings ul li a { - color: #666666; - display: block; - height: 100%; - padding-left: 10px; - position: relative; - text-decoration: none; - transition:all .15s ease-in-out; - width: 100%; -} - -#settings ul li:hover { - background:#efefef; - border-left:4px solid #5775b9; -} - -#settings ul li:hover a { - color:#000000; - text-decoration: none; -} - -#settings ul.visible { - display: block; -} +/* #settings styles removed - now using header navigation menu */ /* Table Styles */ diff --git a/resources/js/angular/views/index.html b/resources/js/angular/views/index.html index 728c219043..755ab733eb 100644 --- a/resources/js/angular/views/index.html +++ b/resources/js/angular/views/index.html @@ -8,40 +8,6 @@ {{::banner}} - - diff --git a/resources/views/components/header.blade.php b/resources/views/components/header.blade.php index c40dbdeb4e..bb59fb4cc7 100755 --- a/resources/views/components/header.blade.php +++ b/resources/views/components/header.blade.php @@ -149,6 +149,35 @@ Calendar +
  • + View + +
  • Project
      From dd8315cf8c73ed58e8f1bc44925f27c540c1bf7f Mon Sep 17 00:00:00 2001 From: Julien Jomier Date: Tue, 13 Jan 2026 20:06:23 -0500 Subject: [PATCH 4/6] Improve filter layout --- .../views/partials/filterdataTemplate.html | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/resources/js/angular/views/partials/filterdataTemplate.html b/resources/js/angular/views/partials/filterdataTemplate.html index 6297c2ab8b..c5328e549d 100644 --- a/resources/js/angular/views/partials/filterdataTemplate.html +++ b/resources/js/angular/views/partials/filterdataTemplate.html @@ -1,13 +1,12 @@
      -
      - Help -

      Filters

      +
      +

      + Filters +

      +
      • Filters
      -
      +
      -
      - Limit results to - - - rows (0 for unlimited) +
      +
      -
      +
      -
      -
      +
      +
      - -   - -   - + + +
      -
      +
      +
      From c2565bba708daeb264bb0a2d228e18af42f785de Mon Sep 17 00:00:00 2001 From: Julien Jomier Date: Tue, 13 Jan 2026 20:17:55 -0500 Subject: [PATCH 5/6] Improve layout for buildgroups --- resources/css/common.css | 10 +- .../js/angular/views/partials/buildgroup.html | 92 +++++++++++++++++-- 2 files changed, 87 insertions(+), 15 deletions(-) diff --git a/resources/css/common.css b/resources/css/common.css index 8e49a7abe3..cb2f878d95 100644 --- a/resources/css/common.css +++ b/resources/css/common.css @@ -937,17 +937,17 @@ div#main_content { } .buildgroup > table.tabb { - -webkit-border-radius:3px; - -moz-border-radius:3px; - border-radius:3px; + -webkit-border-radius: 0 0 8px 8px; + -moz-border-radius: 0 0 8px 8px; + border-radius: 0 0 8px 8px; -webkit-box-shadow:0px 3px 10px -2px rgba(0,0,0,0.4); -moz-box-shadow:0px 3px 10px -2px rgba(0,0,0,0.4); box-shadow:0px 3px 10px -2px rgba(0,0,0,0.4); - overflow:scroll; + overflow:hidden; } .buildgroup > table.tabb tbody { - border-bottom:5px solid #555555; + /* Removed dark border for modern card design */ } .buildgroup table.tabb .table-heading1, diff --git a/resources/js/angular/views/partials/buildgroup.html b/resources/js/angular/views/partials/buildgroup.html index d2d8fb1b44..6d1e891134 100644 --- a/resources/js/angular/views/partials/buildgroup.html +++ b/resources/js/angular/views/partials/buildgroup.html @@ -1,15 +1,80 @@ -

      - - {{::buildgroup.name}} - - {{::buildgroup.numbuildslabel}} - [view timeline] -

      - + +
      +
      +

      + + {{::buildgroup.name}} + +

      + {{::buildgroup.numbuildslabel}} +
      + + + + + View Timeline + + + + + +
      + + +
      +
      +
      + + + {{buildgroup.selectedBuilds.length}} build(s) selected + +
      + +
      + + + +
      + +
      + + +
      + +
      + +
      +
      +
      + +
      + @@ -20,6 +85,13 @@

      + +
      Update Configure
      + + From eccf8912c148c467dc9fd0d6c037dff194a599fe Mon Sep 17 00:00:00 2001 From: Julien Jomier Date: Tue, 13 Jan 2026 20:28:35 -0500 Subject: [PATCH 6/6] revert back the changes handle by other MR --- .../js/angular/views/partials/buildgroup.html | 50 ------------------- 1 file changed, 50 deletions(-) diff --git a/resources/js/angular/views/partials/buildgroup.html b/resources/js/angular/views/partials/buildgroup.html index 6d1e891134..a1fe38dfc3 100644 --- a/resources/js/angular/views/partials/buildgroup.html +++ b/resources/js/angular/views/partials/buildgroup.html @@ -18,59 +18,9 @@

      style="text-decoration: none; font-size: 12px; background: rgba(255,255,255,0.95); border: none;"> View Timeline - - - - -
      -
      -
      - - - {{buildgroup.selectedBuilds.length}} build(s) selected - -
      - -
      - - - -
      - -
      - - -
      - -
      - -
      -
      -
      -