git ui revamp ready for release

isc-hwojnick · isc-hwojnick · commit 9d912b3da756 · 2024-07-01T15:44:37.000-04:00
diff --git a/git-webui/release/share/git-webui/webui/css/git-webui.css b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -866,7 +866,7 @@ body {
   padding-top: 15px;
 }
 #changedFilesContainer .file-area .select-all {
-  border-bottom: 2px solid black;
+  border-bottom: 1px solid lightgray;
 }
 #changedFilesContainer .file-area .select-all .form-check-label {
   font-size: 1rem;
@@ -877,7 +877,7 @@ body {
   margin-bottom: 2px;
 }
 #changedFilesContainer .file-area .diffed-file {
-  background-color: #4daefd;
+  background-color: #7fceff;
 }
 #changedFilesContainer .file-area .form-check {
   padding: 3px 5px 3px 15px;
@@ -894,17 +894,22 @@ body {
   margin-left: -12px !important;
 }
 #changedFilesContainer .file-area .A::after {
-  content: "A";
+  content: "Added";
   position: absolute;
   right: 5px;
 }
 #changedFilesContainer .file-area .D::after {
-  content: "D";
+  content: "Deleted";
   position: absolute;
   right: 5px;
 }
 #changedFilesContainer .file-area .M::after {
-  content: "M";
+  content: "Modified";
+  position: absolute;
+  right: 5px;
+}
+#changedFilesContainer .file-area .R::after {
+  content: "Renamed";
   position: absolute;
   right: 5px;
 }
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2518,6 +2518,7 @@ webui.NewChangedFilesView = function(workspaceView) {
         $("#commitMsg").val("");
         $("#commitMsgDetail").val("");
         $('#selectAllFiles').prop('checked', false);
+
         webui.git("status -u --porcelain", function(data) {
             $.get("api/uncommitted", function (uncommitted) {
                 var uncommittedItems = JSON.parse(uncommitted)["current user's changes"];
@@ -2590,16 +2591,18 @@ webui.NewChangedFilesView = function(workspaceView) {
                         self.deselectAll();
                     }
                 });
-
+                $("#commitBtn").off("click");
                 $("#commitBtn").on("click", function() {
                     var commitMessage = $('#commitMsg').val() + "\n" + $("#commitMsgDetail").val()
                     self.commit(commitMessage);
                 });
 
+                $("#discardBtn").off("click");
                 $("#discardBtn").on("click", function() {
                     self.discard();
                 });
 
+                $("#stashBtn").off("click");
                 $("#stashBtn").on("click", function() {
                     self.stash();
                 });
@@ -2614,6 +2617,9 @@ webui.NewChangedFilesView = function(workspaceView) {
             if (fileIndex == -1) {
                 selectedItems.push(fileName);
             }
+            if (selectedItems.length == Array.from(fileList.children).length) {
+                $('#selectAllFiles').prop('checked', true);
+            } 
         } else {
             $('#selectAllFiles').prop('checked', false);
             if (fileIndex > -1) {
@@ -2692,7 +2698,6 @@ webui.NewChangedFilesView = function(workspaceView) {
     self.discard = function() {
         var selectedFilesAsString = selectedItems.join(" ");
         webui.git("restore -- " + selectedFilesAsString, function(output) {
-            // webui.showSuccess(output);
             workspaceView.update();
         });
     }
@@ -2721,7 +2726,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                         '<input type="area" class="form-control" id="commitMsg" placeholder="Enter commit message (required, 72 character limit)">' +
                     '</div>' +
                     '<div class="form-group">' +
-                        '<textarea class="form-control" id="commitMsgDetail" rows="4" placeholder="Enter commit details (optional, no character limit)"></textarea>' +
+                        '<textarea class="form-control" id="commitMsgDetail" rows="4" placeholder="Enter commit details (optional)"></textarea>' +
                     '</div>' +
                     '<div class="button-group">' +
                         '<button type="button" class="btn btn-primary file-action-button" id="commitBtn" disabled> Commit </button>' +
diff --git a/git-webui/src/share/git-webui/webui/css/git-webui.less b/git-webui/src/share/git-webui/webui/css/git-webui.less
@@ -848,11 +848,11 @@ body {
                 margin-bottom: 2px;
             }
             
-            border-bottom: 2px solid black;
+            border-bottom: 1px solid lightgray;
         }
 
         .diffed-file {
-            background-color: #4daefd;
+            background-color: #7fceff;
         }
 
         
@@ -876,19 +876,25 @@ body {
             margin-left: -12px !important;
         }
         .A::after {
-            content: "A";
+            content: "Added";
             position: absolute;
             right: 5px;
         }
 
         .D::after {
-            content: "D";
+            content: "Deleted";
             position: absolute;
             right: 5px;
         }
 
         .M::after {
-            content: "M";
+            content: "Modified";
+            position: absolute;
+            right: 5px;
+        }
+
+        .R::after {
+            content: "Renamed";
             position: absolute;
             right: 5px;
         }
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -2518,6 +2518,7 @@ webui.NewChangedFilesView = function(workspaceView) {
         $("#commitMsg").val("");
         $("#commitMsgDetail").val("");
         $('#selectAllFiles').prop('checked', false);
+
         webui.git("status -u --porcelain", function(data) {
             $.get("api/uncommitted", function (uncommitted) {
                 var uncommittedItems = JSON.parse(uncommitted)["current user's changes"];
@@ -2590,16 +2591,18 @@ webui.NewChangedFilesView = function(workspaceView) {
                         self.deselectAll();
                     }
                 });
-
+                $("#commitBtn").off("click");
                 $("#commitBtn").on("click", function() {
                     var commitMessage = $('#commitMsg').val() + "\n" + $("#commitMsgDetail").val()
                     self.commit(commitMessage);
                 });
 
+                $("#discardBtn").off("click");
                 $("#discardBtn").on("click", function() {
                     self.discard();
                 });
 
+                $("#stashBtn").off("click");
                 $("#stashBtn").on("click", function() {
                     self.stash();
                 });
@@ -2614,6 +2617,9 @@ webui.NewChangedFilesView = function(workspaceView) {
             if (fileIndex == -1) {
                 selectedItems.push(fileName);
             }
+            if (selectedItems.length == Array.from(fileList.children).length) {
+                $('#selectAllFiles').prop('checked', true);
+            } 
         } else {
             $('#selectAllFiles').prop('checked', false);
             if (fileIndex > -1) {
@@ -2692,7 +2698,6 @@ webui.NewChangedFilesView = function(workspaceView) {
     self.discard = function() {
         var selectedFilesAsString = selectedItems.join(" ");
         webui.git("restore -- " + selectedFilesAsString, function(output) {
-            // webui.showSuccess(output);
             workspaceView.update();
         });
     }
@@ -2721,7 +2726,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                         '<input type="area" class="form-control" id="commitMsg" placeholder="Enter commit message (required, 72 character limit)">' +
                     '</div>' +
                     '<div class="form-group">' +
-                        '<textarea class="form-control" id="commitMsgDetail" rows="4" placeholder="Enter commit details (optional, no character limit)"></textarea>' +
+                        '<textarea class="form-control" id="commitMsgDetail" rows="4" placeholder="Enter commit details (optional)"></textarea>' +
                     '</div>' +
                     '<div class="button-group">' +
                         '<button type="button" class="btn btn-primary file-action-button" id="commitBtn" disabled> Commit </button>' +

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ body {`
`866`	`866`	`padding-top: 15px;`
`867`	`867`	`}`
`868`	`868`	`#changedFilesContainer .file-area .select-all {`
`869`		`- border-bottom: 2px solid black;`
	`869`	`+ border-bottom: 1px solid lightgray;`
`870`	`870`	`}`
`871`	`871`	`#changedFilesContainer .file-area .select-all .form-check-label {`
`872`	`872`	`font-size: 1rem;`
`@@ -877,7 +877,7 @@ body {`
`877`	`877`	`margin-bottom: 2px;`
`878`	`878`	`}`
`879`	`879`	`#changedFilesContainer .file-area .diffed-file {`
`880`		`- background-color: #4daefd;`
	`880`	`+ background-color: #7fceff;`
`881`	`881`	`}`
`882`	`882`	`#changedFilesContainer .file-area .form-check {`
`883`	`883`	`padding: 3px 5px 3px 15px;`
`@@ -894,17 +894,22 @@ body {`
`894`	`894`	`margin-left: -12px !important;`
`895`	`895`	`}`
`896`	`896`	`#changedFilesContainer .file-area .A::after {`
`897`		`- content: "A";`
	`897`	`+ content: "Added";`
`898`	`898`	`position: absolute;`
`899`	`899`	`right: 5px;`
`900`	`900`	`}`
`901`	`901`	`#changedFilesContainer .file-area .D::after {`
`902`		`- content: "D";`
	`902`	`+ content: "Deleted";`
`903`	`903`	`position: absolute;`
`904`	`904`	`right: 5px;`
`905`	`905`	`}`
`906`	`906`	`#changedFilesContainer .file-area .M::after {`
`907`		`- content: "M";`
	`907`	`+ content: "Modified";`
	`908`	`+ position: absolute;`
	`909`	`+ right: 5px;`
	`910`	`+}`
	`911`	`+#changedFilesContainer .file-area .R::after {`
	`912`	`+ content: "Renamed";`
`908`	`913`	`position: absolute;`
`909`	`914`	`right: 5px;`
`910`	`915`	`}`
Original file line number	Diff line number	Diff line change
`@@ -848,11 +848,11 @@ body {`
`848`	`848`	`margin-bottom: 2px;`
`849`	`849`	`}`
`850`	`850`
`851`		`- border-bottom: 2px solid black;`
	`851`	`+ border-bottom: 1px solid lightgray;`
`852`	`852`	`}`
`853`	`853`
`854`	`854`	`.diffed-file {`
`855`		`- background-color: #4daefd;`
	`855`	`+ background-color: #7fceff;`
`856`	`856`	`}`
`857`	`857`
`858`	`858`
`@@ -876,19 +876,25 @@ body {`
`876`	`876`	`margin-left: -12px !important;`
`877`	`877`	`}`
`878`	`878`	`.A::after {`
`879`		`- content: "A";`
	`879`	`+ content: "Added";`
`880`	`880`	`position: absolute;`
`881`	`881`	`right: 5px;`
`882`	`882`	`}`
`883`	`883`
`884`	`884`	`.D::after {`
`885`		`- content: "D";`
	`885`	`+ content: "Deleted";`
`886`	`886`	`position: absolute;`
`887`	`887`	`right: 5px;`
`888`	`888`	`}`
`889`	`889`
`890`	`890`	`.M::after {`
`891`		`- content: "M";`
	`891`	`+ content: "Modified";`
	`892`	`+ position: absolute;`
	`893`	`+ right: 5px;`
	`894`	`+ }`
	`895`	`+`
	`896`	`+ .R::after {`
	`897`	`+ content: "Renamed";`
`892`	`898`	`position: absolute;`
`893`	`899`	`right: 5px;`
`894`	`900`	`}`