Skip to content

The Unified and Autonomous Development Platform

Outline search and shortcuts for various searches

robin shen16aa62278014
diff --git a/product/src/test/java/com/gitplex/server/product/Test.java b/product/src/test/java/com/gitplex/server/product/Test.java
index dc0ad83bb5..ccbd022f4f 100644
--- a/product/src/test/java/com/gitplex/server/product/Test.java
+++ b/product/src/test/java/com/gitplex/server/product/Test.java
@@ -1,12 +1,9 @@
package com.gitplex.server.product;
-import java.nio.file.Paths;
-
public class Test {
@org.junit.Test
public void test() {
- System.out.println(Paths.get("/hello/world").resolveSibling("../just").normalize());
}
}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
index 8ac35fc652..5a808a57af 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
@@ -14,6 +14,7 @@ gitplex.server.codemirror = {
{line: mark.beginLine, ch: mark.beginChar},
{line: mark.endLine, ch: mark.endChar},
{className: "CodeMirror-mark"});
+ cm.setCursor({line: mark.beginLine, ch: mark.beginChar});
},
scrollTo: function(cm, mark) {
var top = cm.charCoords({line: mark.beginLine, ch: 0}, "local").top;
@@ -57,7 +58,7 @@ gitplex.server.codemirror = {
cm.scrollTo(viewState.scroll.left, viewState.scroll.top);
}
},
- bindKeys: function(cm) {
+ bindShortcuts: function(cm) {
cm.setOption("extraKeys", {
"F11": function(cm) {
cm.setOption("fullScreen", !cm.getOption("fullScreen"));
@@ -75,8 +76,8 @@ gitplex.server.codemirror = {
CodeMirror.keyMap.default["Ctrl-L"] = "gotoLine";
}
- if (!($(document).data("CodeMirrorKeyBinded"))) {
- $(document).data("CodeMirrorKeyBinded", true);
+ if (!($(document).data("CodeMirrorShortcutsBinded"))) {
+ $(document).data("CodeMirrorShortcutsBinded", true);
function find() {
if ($(".code>.CodeMirror").length != 0) {
diff --git a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
index 28780f2703..1d4ef07bc0 100644
--- a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
@@ -11,6 +11,7 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.model.Depot;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.web.component.depotselector.DepotSelector;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
@SuppressWarnings("serial")
@@ -28,12 +29,12 @@ public abstract class DepotPicker extends DropdownLink {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new DepotSelector(id, depotsModel, currentDepotId) {
@Override
protected void onSelect(AjaxRequestTarget target, Depot depot) {
- closeDropdown();
+ dropdown.close();
target.add(DepotPicker.this);
DepotPicker.this.onSelect(target, depot);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
index 3a09f0fd09..3e45251a7a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
@@ -7,6 +7,7 @@ import org.apache.wicket.model.Model;
import org.unbescape.html.HtmlEscape;
import com.gitplex.server.model.Depot;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
@SuppressWarnings("serial")
@@ -24,12 +25,12 @@ public abstract class BranchPicker extends DropdownLink {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new BranchSelector(id, depotModel, branch) {
@Override
protected void onSelect(AjaxRequestTarget target, String branch) {
- closeDropdown();
+ dropdown.close();
BranchPicker.this.branch = branch;
target.add(BranchPicker.this);
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.html b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.html
index 20bc7eea3a..f7e8080644 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.html
@@ -3,6 +3,7 @@
<!-- Add form tag so that the default delete button can be triggered when user hits return -->
<form>
<div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
<h4 id="modal-title" class="modal-title">
Do you really want to delete?
</h4>
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java
index 99f58beb68..82035d091c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java
@@ -22,6 +22,14 @@ abstract class ConfirmDeletePanel extends Panel {
protected void onInitialize() {
super.onInitialize();
+ add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
add(new Label("message", new AbstractReadOnlyModel<String>() {
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
index 9eed77ace9..de1ee2edce 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
@@ -9,6 +9,7 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.model.Depot;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
public abstract class CreateBranchLink extends ModalLink {
@@ -33,18 +34,18 @@ public abstract class CreateBranchLink extends ModalLink {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
return new CreateBranchPanel(id, depotModel, revision) {
@Override
protected void onCreate(AjaxRequestTarget target, String branch) {
- closeModal();
+ modal.close();
CreateBranchLink.this.onCreate(target, branch);
}
@Override
protected void onCancel(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
index 7d7638c66c..dec0a48237 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
@@ -9,6 +9,7 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.model.Depot;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
public abstract class CreateTagLink extends ModalLink {
@@ -34,18 +35,18 @@ public abstract class CreateTagLink extends ModalLink {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
return new CreateTagPanel(id, depotModel, revision) {
@Override
protected void onCreate(AjaxRequestTarget target, String tag) {
- closeModal();
+ modal.close();
CreateTagLink.this.onCreate(target, tag);
}
@Override
protected void onCancel(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index 2316c9c673..79b26f69b3 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -81,6 +81,7 @@ import com.gitplex.server.web.component.comment.comparecontext.CompareContextPan
import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;
import com.gitplex.server.web.component.diff.blob.SourceAware;
import com.gitplex.server.web.component.diff.diffstat.DiffStatBar;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.menu.MenuItem;
import com.gitplex.server.web.component.menu.MenuLink;
@@ -465,7 +466,7 @@ public class RevisionDiffPanel extends Panel {
add(new MenuLink("whitespaceOption") {
@Override
- protected List<MenuItem> getMenuItems() {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
for (WhitespaceOption each: WhitespaceOption.values()) {
@@ -490,7 +491,7 @@ public class RevisionDiffPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- closeDropdown();
+ dropdown.close();
whitespaceOptionModel.setObject(each);
target.add(body);
}
@@ -1011,7 +1012,7 @@ public class RevisionDiffPanel extends Panel {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new CompareContextPanel(id, requestModel, new AbstractReadOnlyModel<CodeComment>() {
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.java b/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.java
index b44a150279..3eedcfdd04 100644
--- a/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.java
@@ -8,6 +8,7 @@ import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.model.IModel;
import com.gitplex.server.model.Depot;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.menu.MenuItem;
import com.gitplex.server.web.component.menu.MenuLink;
import com.gitplex.server.web.util.resource.ArchiveResource;
@@ -24,15 +25,10 @@ public abstract class ArchiveMenuLink extends MenuLink {
}
@Override
- protected List<MenuItem> getMenuItems() {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "zip";
@@ -54,11 +50,6 @@ public abstract class ArchiveMenuLink extends MenuLink {
});
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "tar.gz";
diff --git a/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java b/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java
index a5a87e02e4..8e1f69f358 100644
--- a/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java
@@ -94,7 +94,7 @@ public abstract class DropdownLink extends AjaxLink<Void> {
@Override
protected Component newContent(String id) {
- return DropdownLink.this.newContent(id);
+ return DropdownLink.this.newContent(id, this);
}
@Override
@@ -122,11 +122,6 @@ public abstract class DropdownLink extends AjaxLink<Void> {
}
}
- public void closeDropdown() {
- if (dropdown != null)
- dropdown.close();
- }
-
public String getCloseScript() {
if (dropdown != null) {
return String.format("gitplex.server.floating.close($('#%s'), true);", dropdown.getMarkupId());
@@ -150,5 +145,5 @@ public abstract class DropdownLink extends AjaxLink<Void> {
response.render(OnDomReadyHeaderItem.forScript(script));
}
- protected abstract Component newContent(String id);
+ protected abstract Component newContent(String id, FloatingPanel dropdown);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
index 3a551a7122..3411773bfe 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
@@ -1,16 +1,15 @@
<wicket:panel>
<div class="modal-header">
- <button wicket:id="close" type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <button wicket:id="close" type="button" class="close">&times;</button>
<h4 wicket:id="title" class="modal-title"></h4>
</div>
- <div class="modal-body insert-url">
+ <div class="modal-body insert-url no-autofocus">
<div class="section">
<div class="content">
- <label>Input Url</label>
<form wicket:id="urlForm" class="form-inline url">
<div class="form-group">
- <input wicket:id="url" class="form-control autofocus url"></input>
- <button wicket:id="ok" type="submit" class="btn btn-default">OK</button>
+ <input wicket:id="url" placeholder="Input url" class="form-control autofocus url"></input>
+ <button wicket:id="ok" type="submit" class="btn btn-default">Insert</button>
</div>
<div wicket:id="feedback" class="feedback"></div>
</form>
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
index baedd11251..762f8f98ae 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
@@ -43,6 +43,7 @@ import com.gitplex.server.git.BlobIdentFilter;
import com.gitplex.server.model.Depot;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.web.component.depotfilepicker.DepotFilePicker;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
@@ -69,6 +70,15 @@ class InsertUrlPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
+ add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ markdownEditor.closeUrlInserter(target, this);
+ }
+
+ });
+
if (isImage)
add(new Label("title", "Insert Image"));
else
@@ -108,7 +118,7 @@ class InsertUrlPanel extends Panel {
target.add(InsertUrlPanel.this);
} else {
markdownEditor.insertUrl(target, isImage, url, null, null);
- markdownEditor.closeUrlSelector(target, InsertUrlPanel.this);
+ markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);
}
}
@@ -140,7 +150,7 @@ class InsertUrlPanel extends Panel {
add(new DropdownLink("blobPicker") {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new DepotFilePicker(id, new AbstractReadOnlyModel<Depot>() {
@Override
@@ -158,8 +168,8 @@ class InsertUrlPanel extends Panel {
Path relativized = Paths.get(baseUrl).relativize(Paths.get(referenceUrl));
String relativePath = relativized.toString().replace('\\', '/').substring("../".length());
markdownEditor.insertUrl(target, isImage, relativePath, blobIdent.getName(), null);
- markdownEditor.closeUrlSelector(target, InsertUrlPanel.this);
- closeDropdown();
+ markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);
+ dropdown.close();
}
@Override
@@ -204,7 +214,7 @@ class InsertUrlPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
markdownEditor.insertUrl(target, isImage, attachmentUrl, attachmentName, null);
- markdownEditor.closeUrlSelector(target, InsertUrlPanel.this);
+ markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);
}
@Override
@@ -276,7 +286,7 @@ class InsertUrlPanel extends Panel {
}
markdownEditor.insertUrl(target, isImage,
attachmentSupport.getAttachmentUrl(attachmentName), attachmentName, null);
- markdownEditor.closeUrlSelector(target, InsertUrlPanel.this);
+ markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);
} else {
error("Please select a non-empty file");
target.add(InsertUrlPanel.this);
@@ -298,15 +308,6 @@ class InsertUrlPanel extends Panel {
uploadForm.setVisible(attachmentSupport != null);
add(uploadForm);
- add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- markdownEditor.closeUrlSelector(target, InsertUrlPanel.this);
- }
-
- });
-
setOutputMarkupId(true);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
index 540b0f70c3..84f38df2aa 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
@@ -369,9 +369,9 @@ public class MarkdownEditor extends FormComponentPanel<String> {
target.appendJavaScript(script);
}
- public void closeUrlSelector(AjaxRequestTarget target, Component urlSelector) {
- BasePage page = (BasePage) urlSelector.getPage();
- page.getRootComponents().remove(urlSelector);
+ public void closeUrlInserter(AjaxRequestTarget target, Component urlInserter) {
+ BasePage page = (BasePage) urlInserter.getPage();
+ page.getRootComponents().remove(urlInserter);
String script = String.format("$('#%s-urlselector').closest('.modal').modal('hide');", container.getMarkupId());
target.appendJavaScript(script);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/menu/MenuItem.java b/web/src/main/java/com/gitplex/server/web/component/menu/MenuItem.java
index a6d840e929..5b4dd19a5c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/menu/MenuItem.java
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuItem.java
@@ -11,10 +11,16 @@ public abstract class MenuItem implements Serializable {
private static final long serialVersionUID = 1L;
@Nullable
- public abstract String getIconClass();
+ public String getIconClass() {
+ return null;
+ }
public abstract String getLabel();
public abstract WebMarkupContainer newLink(String id);
+ @Nullable
+ public String getShortcut() {
+ return null;
+ };
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java b/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java
index 4bb0875ddb..72b66fdd41 100644
--- a/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java
@@ -37,12 +37,12 @@ public abstract class MenuLink extends DropdownLink {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new MenuPanel(id) {
@Override
protected List<MenuItem> getMenuItems() {
- return MenuLink.this.getMenuItems();
+ return MenuLink.this.getMenuItems(dropdown);
}
};
@@ -54,5 +54,5 @@ public abstract class MenuLink extends DropdownLink {
response.render(CssHeaderItem.forReference(new MenuResourceReference()));
}
- protected abstract List<MenuItem> getMenuItems();
+ protected abstract List<MenuItem> getMenuItems(FloatingPanel dropdown);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.html b/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.html
index 65183a879a..1adf30ec1e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.html
@@ -3,6 +3,6 @@
<li wicket:id="items"><wicket:container wicket:id="content"></wicket:container></li>
</ul>
<wicket:fragment wicket:id="contentFrag">
- <a wicket:id="link"><span wicket:id="icon" class="icon"></span> <span wicket:id="label"></span></a>
+ <a wicket:id="link"><span wicket:id="icon" class="icon"></span> <span wicket:id="label" class="text"></span> <span wicket:id="shortcut" class="shortcut"></span></a>
</wicket:fragment>
</wicket:panel>
diff --git a/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.java b/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.java
index f7891cfff8..7d8495098c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.java
@@ -24,6 +24,21 @@ abstract class MenuPanel extends Panel {
super.onInitialize();
setOutputMarkupId(true);
+
+ List<MenuItem> menuItems = getMenuItems();
+ boolean hasIcons = false;
+ boolean hasShortcuts = false;
+ for (MenuItem menuItem: menuItems) {
+ if (menuItem.getIconClass() != null)
+ hasIcons = true;
+ if (menuItem.getShortcut() != null)
+ hasShortcuts = true;
+ }
+
+ if (hasIcons)
+ add(AttributeAppender.append("class", "has-icons"));
+ if (hasShortcuts)
+ add(AttributeAppender.append("class", "has-shortcuts"));
add(new ListView<MenuItem>("items", new LoadableDetachableModel<List<MenuItem>>() {
@@ -47,6 +62,7 @@ abstract class MenuPanel extends Panel {
}
link.add(icon);
link.add(new Label("label", menuItem.getLabel()));
+ link.add(new Label("shortcut", menuItem.getShortcut()));
fragment.add(link);
item.add(fragment);
} else {
diff --git a/web/src/main/java/com/gitplex/server/web/component/menu/menu.css b/web/src/main/java/com/gitplex/server/web/component/menu/menu.css
index da9700fdae..296213e67b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/menu/menu.css
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/menu.css
@@ -19,9 +19,22 @@
font-weight: normal;
line-height: 20px;
text-decoration: none;
- padding: 6px 24px 6px 32px;
+ padding: 6px 24px;
white-space: nowrap;
}
+.floating.menu .shortcut {
+ font-weight: bold;
+ color: #666;
+ position: absolute;
+ right: 12px;
+}
+
+.floating.menu .has-icons ul>li>a {
+ padding-left: 32px;
+}
+.floating.menu .has-shortcuts ul>li>a {
+ padding-right: 120px;
+}
.floating.menu ul>li>a>.icon {
position: absolute;
left: 8px;
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
index 6d485e89dc..363ba5f0ce 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
@@ -22,7 +22,7 @@ public abstract class ModalLink extends AjaxLink<Void> {
@Override
protected Component newContent(String id) {
- return ModalLink.this.newContent(id);
+ return ModalLink.this.newContent(id, this);
}
@Override
@@ -35,10 +35,5 @@ public abstract class ModalLink extends AjaxLink<Void> {
}
}
- protected void closeModal() {
- if (modal != null)
- modal.close();
- }
-
- protected abstract Component newContent(String id);
+ protected abstract Component newContent(String id, ModalPanel modal);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
index 251004bf7f..759da92a38 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
@@ -93,7 +93,6 @@ public abstract class ModalPanel extends Panel {
}
protected void onClosed() {
-
}
}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
index 617917bab3..d43687abce 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
@@ -19,6 +19,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestVerification;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
@SuppressWarnings("serial")
@@ -51,7 +52,7 @@ public class VerificationStatusPanel extends Panel {
DropdownLink link = new DropdownLink("link") {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
Fragment fragment = new Fragment(id, "detailFrag", VerificationStatusPanel.this);
IModel<List<PullRequestVerification>> model = new AbstractReadOnlyModel<List<PullRequestVerification>>() {
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
index baf9850fc9..a03d8e63cd 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
@@ -10,6 +10,7 @@ import org.apache.wicket.model.Model;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.support.DepotAndRevision;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.modal.ModalPanel;
@@ -35,12 +36,12 @@ public abstract class RevisionPicker extends DropdownLink {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new RevisionSelector(id, depotModel, revision, canCreateRef) {
@Override
protected void onSelect(AjaxRequestTarget target, String revision) {
- closeDropdown();
+ dropdown.close();
RevisionPicker.this.revision = revision;
target.add(RevisionPicker.this);
@@ -50,7 +51,7 @@ public abstract class RevisionPicker extends DropdownLink {
@Override
protected void onModalOpened(AjaxRequestTarget target, ModalPanel modal) {
super.onModalOpened(target, modal);
- closeDropdown();
+ dropdown.close();
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.css b/web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.css
index 96b1b2f48e..03bd2ec64e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.css
+++ b/web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.css
@@ -1,6 +1,6 @@
.source-format select {
color: #444;
- height: 30px;
+ height: 22px;
padding: 0;
border-radius: 3px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
index b2e39be2c8..eed1de2990 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
@@ -34,6 +34,7 @@ import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;
import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
@@ -110,12 +111,12 @@ public class CollaboratorDepotListPage extends CollaboratorPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, false, filterPrivilege) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(depotsContainer);
@@ -312,12 +313,12 @@ public class CollaboratorDepotListPage extends CollaboratorPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
UserAuthorization authorization = item.getModelObject();
authorization.setPrivilege(privilege);
GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
index 1056956458..b1b4442e84 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
@@ -23,6 +23,7 @@ import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.security.privilege.DepotPrivilege;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
@@ -94,12 +95,12 @@ public class CollaboratorEffectivePrivilegePage extends CollaboratorPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, true, filterPrivilege) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(depotsContainer);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
index 207720c058..90ec53f818 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
@@ -23,6 +23,7 @@ import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.security.privilege.DepotPrivilege;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
@@ -94,12 +95,12 @@ public class MemberEffectivePrivilegePage extends MemberPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, true, filterPrivilege) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(depotsContainer);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
index 2cbd658eb0..9764491d7f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
@@ -33,6 +33,7 @@ import com.gitplex.server.security.privilege.DepotPrivilege;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.avatar.Avatar;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;
@@ -110,12 +111,12 @@ public class MemberListPage extends AccountLayoutPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new RoleSelectionPanel(id, filterRole) {
@Override
protected void onSelectAdmin(AjaxRequestTarget target) {
- closeDropdown();
+ dropdown.close();
filterRole = ROLE_ADMIN;
target.add(filterContainer);
target.add(membersContainer);
@@ -125,7 +126,7 @@ public class MemberListPage extends AccountLayoutPage {
@Override
protected void onSelectOrdinary(AjaxRequestTarget target) {
- closeDropdown();
+ dropdown.close();
filterRole = ROLE_MEMBER;
target.add(filterContainer);
target.add(membersContainer);
@@ -277,12 +278,12 @@ public class MemberListPage extends AccountLayoutPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new RoleSelectionPanel(id, item.getModelObject().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {
@Override
protected void onSelectOrdinary(AjaxRequestTarget target) {
- closeDropdown();
+ dropdown.close();
membership.setAdmin(false);
GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);
target.add(pagingNavigator);
@@ -293,7 +294,7 @@ public class MemberListPage extends AccountLayoutPage {
@Override
protected void onSelectAdmin(AjaxRequestTarget target) {
- closeDropdown();
+ dropdown.close();
membership.setAdmin(true);
GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);
target.add(pagingNavigator);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
index 5e83dfcfdc..4f41e29815 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
@@ -26,6 +26,7 @@ import com.gitplex.server.model.Account;
import com.gitplex.server.model.OrganizationMembership;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.avatar.AvatarLink;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.AccountLink;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
@@ -103,12 +104,12 @@ public abstract class MemberPage extends AccountLayoutPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new RoleSelectionPanel(id, getMembership().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {
@Override
protected void onSelectOrdinary(AjaxRequestTarget target) {
- closeDropdown();
+ dropdown.close();
getMembership().setAdmin(false);
GitPlex.getInstance(OrganizationMembershipManager.class).save(getMembership());
setResponsePage(getPageClass(), getPageParameters());
@@ -117,7 +118,7 @@ public abstract class MemberPage extends AccountLayoutPage {
@Override
protected void onSelectAdmin(AjaxRequestTarget target) {
- closeDropdown();
+ dropdown.close();
getMembership().setAdmin(true);
GitPlex.getInstance(OrganizationMembershipManager.class).save(getMembership());
setResponsePage(getPageClass(), getPageParameters());
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
index 985d973feb..9914a43565 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
@@ -36,10 +36,12 @@ import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;
import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
import com.gitplex.server.web.component.select2.Response;
import com.gitplex.server.web.component.select2.ResponseFiller;
@@ -115,12 +117,12 @@ public class TeamDepotListPage extends TeamPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, false, filterPrivilege) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(depotsContainer);
@@ -298,12 +300,12 @@ public class TeamDepotListPage extends TeamPage {
greaterPrivileges.add(new ModalLink("detail") {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
return new GreaterPrivilegesPanel(id, item.getModel()) {
@Override
protected void onClose(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
};
@@ -328,12 +330,12 @@ public class TeamDepotListPage extends TeamPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
TeamAuthorization authorization = item.getModelObject();
authorization.setPrivilege(privilege);
GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.css b/web/src/main/java/com/gitplex/server/web/page/base/base.css
index 1e4558a4e5..af998b809b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/base.css
+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.css
@@ -427,7 +427,7 @@ div.center {
li.selectable a, a.selectable {
border: 1px solid white;
- text-decoration: none;
+ text-decoration: none !important;
display: block;
padding: 2px 4px;
color: #333;
@@ -510,6 +510,6 @@ input.search {
margin-right: 4px;
}
-.wicket-mfu-caption {
- margin-top: 4px;
+.modal-header .close {
+ font-family: sans-serif;
}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
index 834fee5d32..125734d055 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
@@ -34,6 +34,7 @@ import com.gitplex.server.manager.VisitInfoManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.tabbable.PageTab;
@@ -204,12 +205,12 @@ public abstract class DepotPage extends AccountPage {
fragment.add(new DropdownLink("depotMoreInfo") {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new MoreInfoPanel(id, depotModel) {
@Override
protected void onPromptForkOption(AjaxRequestTarget target) {
- closeDropdown();
+ dropdown.close();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.html
index 624e6750ab..94e72f01a0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.html
@@ -1,6 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="upload-blobs">
<div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
<h4 class="modal-title">Upload Files</h4>
</div>
<div class="modal-body">
@@ -18,10 +19,8 @@
</div>
</div>
<div class="modal-footer">
- <div class="form-group">
- <button wicket:id="upload" class="btn btn-primary">Upload</button>
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
+ <button wicket:id="upload" class="btn btn-primary">Upload</button>
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
</div>
</form>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
index 16a28dc001..c4cd8b2d2c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
@@ -62,6 +62,15 @@ abstract class BlobUploadPanel extends Panel {
form.setFileMaxSize(Bytes.megabytes(MAX_FILE_SIZE));
add(form);
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
NotificationPanel feedback = new NotificationPanel("feedback", form);
feedback.setOutputMarkupPlaceholderTag(true);
form.add(feedback);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html
index 0f48b4b2c2..bf947b71ef 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html
@@ -4,11 +4,10 @@
<a wicket:id="revisionPicker" class="revision-picker pull-left"></a>
<div wicket:id="blobNavigator" class="blob-navigator pull-left"></div>
<div wicket:id="blobOperations" class="operations">
- <span wicket:id="instantSearch"></span>
- <a wicket:id="advancedSearch" title="Advanced search of symbols, files and texts"><i class="fa fa-binoculars"></i></a>
- <a wicket:id="history" title="Commit history of current path"><i class="fa fa-history"></i></a>
- <a wicket:id="add" title="Create or upload files"><i class="fa fa-plus"></i></a>
- <a wicket:id="download" title="Download zip archive of whole repository at this revision"><i class="fa fa-download"></i></a>
+ <a wicket:id="history" title="Commit history of current path">History</a>
+ <a wicket:id="add" title="Add files to current directory">Add <i class="fa fa-caret-down"></i></a>
+ <a wicket:id="download" title="Download archive of whole repository at this revision">Download <i class="fa fa-caret-down"></i></a>
+ <a wicket:id="search" title="Search files, symbols and texts">Search <i class="fa fa-caret-down"></i></a>
</div>
</div>
<!-- below is used to hold file navigator if there is not enough space in head -->
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
index 83db6ba390..825848b974 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
@@ -17,6 +17,7 @@ import org.apache.shiro.util.ThreadContext;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.IEvent;
@@ -27,11 +28,14 @@ import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
+import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.util.visit.IVisit;
+import org.apache.wicket.util.visit.IVisitor;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -62,12 +66,15 @@ import com.gitplex.server.search.query.BlobQuery;
import com.gitplex.server.search.query.TextQuery;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.PrioritizedComponentRenderer;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.ArchiveMenuLink;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.menu.MenuItem;
import com.gitplex.server.web.component.menu.MenuLink;
import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.revisionpicker.RevisionPicker;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
@@ -75,8 +82,9 @@ import com.gitplex.server.web.page.depot.blob.navigator.BlobNavigator;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;
import com.gitplex.server.web.page.depot.blob.render.view.MarkSupport;
+import com.gitplex.server.web.page.depot.blob.search.SearchMenuContributor;
import com.gitplex.server.web.page.depot.blob.search.advanced.AdvancedSearchPanel;
-import com.gitplex.server.web.page.depot.blob.search.instant.InstantSearchPanel;
+import com.gitplex.server.web.page.depot.blob.search.quick.QuickSearchPanel;
import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;
import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
@@ -124,6 +132,8 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
private WebMarkupContainer searchResult;
+ private AbstractPostAjaxBehavior ajaxBehavior;
+
public DepotBlobPage(PageParameters params) {
super(params);
@@ -238,6 +248,40 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
}
newSearchResult(null, queryHits);
+
+ add(ajaxBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ String action = params.getParameterValue("action").toString();
+ switch (action) {
+ case "quickSearch":
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return newQuickSearchPanel(id, this);
+ }
+
+ };
+ break;
+ case "advancedSearch":
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return newAdvancedSearchPanel(id, this);
+ }
+
+ };
+ break;
+ default:
+ throw new IllegalStateException("Unexpected action: " + action);
+ }
+ }
+
+ });
add(new WebSocketRenderBehavior() {
@@ -290,15 +334,10 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
blobOperations.add(new MenuLink("add") {
@Override
- protected List<MenuItem> getMenuItems() {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "Create New File";
@@ -311,7 +350,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
@Override
public void onClick(AjaxRequestTarget target) {
onModeChange(target, Mode.ADD);
- closeDropdown();
+ dropdown.close();
}
};
@@ -321,11 +360,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "Upload Files";
@@ -338,22 +372,22 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
@Override
public void onClick(AjaxRequestTarget target) {
super.onClick(target);
- closeDropdown();
+ dropdown.close();
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
return new BlobUploadPanel(id, DepotBlobPage.this) {
@Override
void onCancel(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
@Override
void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {
DepotBlobPage.this.onCommitted(target, oldCommit, newCommit);
- closeModal();
+ modal.close();
}
};
@@ -377,79 +411,98 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
});
- blobOperations.add(new InstantSearchPanel("instantSearch", depotModel, new AbstractReadOnlyModel<String>() {
+ blobOperations.add(new MenuLink("search") {
@Override
- public String getObject() {
- return state.blobIdent.revision;
- }
-
- }) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
- BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),
- FileMode.REGULAR_FILE.getBits());
- DepotBlobPage.this.onSelect(target, selected, hit.getTokenPos());
- }
-
- @Override
- protected void onMoreQueried(AjaxRequestTarget target, List<QueryHit> hits) {
- newSearchResult(target, hits);
- resizeWindow(target);
- }
-
- });
-
- blobOperations.add(new ModalLink("advancedSearch") {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ menuItems.add(new MenuItem() {
- @Override
- protected Component newContent(String id) {
- return new AdvancedSearchPanel(id, depotModel, new AbstractReadOnlyModel<String>() {
+ @Override
+ public String getShortcut() {
+ return "Alt+Shift+F";
+ }
@Override
- public String getObject() {
- return state.blobIdent.revision;
+ public String getLabel() {
+ return "File and Symbol Search";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return newQuickSearchPanel(id, modal);
+ }
+
+ };
}
- }) {
+ });
+ menuItems.add(new MenuItem() {
@Override
- protected void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {
- newSearchResult(target, hits);
- resizeWindow(target);
- closeModal();
+ public String getShortcut() {
+ return "Alt+Shift+T";
}
@Override
- protected void onCancel(AjaxRequestTarget target) {
- closeModal();
+ public String getLabel() {
+ return "Text and Advanced Search";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return newAdvancedSearchPanel(id, modal);
+ }
+
+ };
}
+
+ });
+
+ IVisitor<Component, Component> visitor = new IVisitor<Component, Component>() {
@Override
- protected BlobIdent getCurrentBlob() {
- return state.blobIdent;
+ public void component(Component object, IVisit<Component> visit) {
+ visit.stop(object);
}
};
+ SearchMenuContributor contributor = (SearchMenuContributor) getPage().visitChildren(
+ SearchMenuContributor.class, visitor);
+ if (contributor != null)
+ menuItems.addAll(contributor.getMenuItems(dropdown));
+
+ return menuItems;
}
});
-
+
DepotCommitsPage.State commitsState = new DepotCommitsPage.State();
commitsState.compareWith = resolvedRevision.name();
if (state.blobIdent.path != null)
commitsState.query = String.format("path(%s)", DepotBlobPage.this.state.blobIdent.path);
blobOperations.add(new ViewStateAwarePageLink<Void>("history", DepotCommitsPage.class,
- DepotCommitsPage.paramsOf(getDepot(), commitsState)) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(state.blobIdent.isTree());
- }
-
- });
+ DepotCommitsPage.paramsOf(getDepot(), commitsState)));
blobOperations.add(new ArchiveMenuLink("download", depotModel) {
@@ -473,6 +526,69 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
add(blobOperations);
}
}
+
+ private QuickSearchPanel newQuickSearchPanel(String id, ModalPanel modal) {
+ return new QuickSearchPanel(id, depotModel, new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return state.blobIdent.revision;
+ }
+
+ }) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
+ BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),
+ FileMode.REGULAR_FILE.getBits());
+ DepotBlobPage.this.onSelect(target, selected, hit.getTokenPos());
+ modal.close();
+ }
+
+ @Override
+ protected void onMoreQueried(AjaxRequestTarget target, List<QueryHit> hits) {
+ newSearchResult(target, hits);
+ resizeWindow(target);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ private AdvancedSearchPanel newAdvancedSearchPanel(String id, ModalPanel modal) {
+ return new AdvancedSearchPanel(id, depotModel, new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return state.blobIdent.revision;
+ }
+
+ }) {
+
+ @Override
+ protected void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {
+ newSearchResult(target, hits);
+ resizeWindow(target);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected BlobIdent getCurrentBlob() {
+ return state.blobIdent;
+ }
+
+ };
+ }
private void newBlobContent(@Nullable AjaxRequestTarget target) {
PrioritizedComponentRenderer mostPrioritizedRenderer = null;
@@ -617,7 +733,12 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new DepotBlobResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("gitplex.server.depotBlob.onDomReady();"));
+
+ String callback = ajaxBehavior.getCallbackFunction(explicit("action")).toString();
+ String script = String.format("gitplex.server.depotBlob.onDomReady(%s);", callback);
+
+ response.render(OnDomReadyHeaderItem.forScript(script));
+
response.render(OnLoadHeaderItem.forScript("gitplex.server.depotBlob.onWindowLoad();"));
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.css
index c059443aa7..360eda7b60 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.css
@@ -50,38 +50,13 @@
}
#depot-blob>.head>.operations {
+ margin-top: 4px;
position: absolute;
- margin-top: 5px;
- right: 6px;
+ right: 0;
}
-#depot-blob>.head>.operations>a, #depot-blob>.head>.operations>span {
- color: #666;
- margin-right: 8px;
-}
-#depot-blob>.head>.operations .fa-download {
- font-size: 16px;
- vertical-align: bottom;
-}
-#depot-blob>.head>.operations .fa-history {
- font-size: 16px;
- vertical-align: middle;
-}
-#depot-blob>.head>.operations .fa-plus {
- font-size: 16px;
- vertical-align: middle;
-}
-#depot-blob>.head>.operations input {
- border-radius: 0;
- border-color: #BBB;
- height: 30px;
- border-top: none;
- border-bottom: none;
- top: -5px;
- padding: 0px 8px;
- position: absolute;
- width: 250px;
- left: -260px;
- font-size: 14px;
+#depot-blob>.head>.operations>a {
+ padding: 4px 8px;
+ color: #333;
}
#depot-blob>.blob-navigator {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js
index 6964c62023..521159042a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js
@@ -1,5 +1,5 @@
gitplex.server.depotBlob = {
- onDomReady: function() {
+ onDomReady: function(callback) {
// hide browser scrollbar as we will manage it in blob content container
$("body").css("overflow", "hidden");
@@ -9,6 +9,7 @@ gitplex.server.depotBlob = {
var height = Cookies.get(cookieKey);
if (height)
$searchResult.outerHeight(height);
+
$searchResult.resizable({
autoHide: false,
handles: {"n": "#search-result-resize-handle"},
@@ -36,7 +37,7 @@ gitplex.server.depotBlob = {
var headWidth = $("#depot").width() - $("#depot>.sidebar>table>tbody>tr>td.nav").outerWidth();
// below code moves file navigator to bottom if it is too wide
- var maxWidth = headWidth - $revisionPicker.outerWidth() - 110;
+ var maxWidth = headWidth - $revisionPicker.outerWidth() - 130;
var maxHeight = $head.height();
var $blobNavigator = $head.find(">.blob-navigator");
@@ -73,6 +74,18 @@ gitplex.server.depotBlob = {
$blobContent.find(".autofit:visible").first().triggerHandler(
"autofit", [$blobContent.width(), $blobContent.height()]);
});
+
+ document.addEventListener("keydown", function(e) {
+ if (e.altKey && e.shiftKey && $(".modal:visible").length == 0) {
+ if (e.keyCode === 70) {
+ e.preventDefault();
+ callback("quickSearch");
+ } else if (e.keyCode === 84) {
+ e.preventDefault();
+ callback("advancedSearch");
+ }
+ }
+ });
},
getClientHeight: function() {
var height = $(window).height()-$("#depot-blob>.blob-content").offset().top;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
index efe8c2b166..762cc78405 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
@@ -145,7 +145,7 @@ public class BlobNavigator extends Panel {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new NestedTree<BlobIdent>(id, new ITreeProvider<BlobIdent>() {
@Override
@@ -207,7 +207,7 @@ public class BlobNavigator extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
context.onSelect(target, model.getObject(), null);
- closeDropdown();
+ dropdown.close();
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
index d0ca8e6f5d..99d58c9d57 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
@@ -29,6 +29,21 @@
<wicket:fragment wicket:id="outlineNodeFrag">
<img wicket:id="icon"></img> <a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
+ <wicket:fragment wicket:id="outlineSearchFrag">
+ <div class="outline-search">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 class="modal-title">Outline Search</h4>
+ </div>
+ <div class="modal-body">
+ <input wicket:id="input" class="form-control autofocus"></input>
+ <div wicket:id="result" class="result"></div>
+ </div>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="outlineSearchNodeFrag">
+ <a wicket:id="link" class="selectable"><img wicket:id="icon"></img> <span wicket:id="label"></span></a>
+ </wicket:fragment>
<wicket:fragment wicket:id="newCommentFrag">
<form wicket:id="form" class="new-comment leave-confirm">
<div wicket:id="feedback" class="feedback"></div>
@@ -42,6 +57,6 @@
</form>
</wicket:fragment>
<wicket:fragment wicket:id="actionsFrag">
- <a wicket:id="outline" class="btn btn-default btn-sm outline-toggle"><i class="fa fa-list-ul"></i> Outline</a>
+ <input type="checkbox" wicket:id="outline" class="outline-toggle"> Outline</input>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
index 05f92e4602..a0a33e1f43 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
@@ -15,8 +15,11 @@ import javax.servlet.http.Cookie;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
@@ -29,7 +32,9 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
@@ -76,8 +81,12 @@ import com.gitplex.server.web.component.comment.CodeCommentPanel;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
import com.gitplex.server.web.component.comment.comparecontext.CompareContextPanel;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
+import com.gitplex.server.web.component.menu.MenuItem;
+import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;
import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;
import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;
@@ -86,6 +95,7 @@ import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;
import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;
import com.gitplex.server.web.page.depot.blob.render.view.MarkSupport;
+import com.gitplex.server.web.page.depot.blob.search.SearchMenuContributor;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.util.DateUtils;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
@@ -101,7 +111,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
*
*/
@SuppressWarnings("serial")
-public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
+public class SourceViewPanel extends BlobViewPanel implements MarkSupport, SearchMenuContributor {
private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);
@@ -124,7 +134,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
private WebMarkupContainer commentContainer;
- private WebMarkupContainer outlineContainer;
+ private WebMarkupContainer outline;
private SourceFormatPanel sourceFormat;
@@ -178,24 +188,20 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
public WebMarkupContainer newAdditionalActions(String id) {
WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);
if (!symbols.isEmpty()) {
- actions.add(new AjaxLink<Void>("outline") {
+ actions.add(new CheckBox("outline", Model.of(isOutlineVisibleInitially())).add(new OnChangeAjaxBehavior() {
@Override
- public void onClick(AjaxRequestTarget target) {
- toggleOutline(target);
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setMethod(Method.POST);
}
-
- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@Override
- public String getObject() {
- if (outlineContainer.isVisible())
- return "active";
- else
- return "";
+ protected void onUpdate(AjaxRequestTarget target) {
+ toggleOutline(target);
}
- })));
+ }));
} else {
actions.add(new WebMarkupContainer("outline").setVisible(false));
}
@@ -205,16 +211,16 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
private void toggleOutline(AjaxRequestTarget target) {
WebResponse response = (WebResponse) RequestCycle.get().getResponse();
Cookie cookie;
- if (outlineContainer.isVisible()) {
+ if (outline.isVisible()) {
cookie = new Cookie(COOKIE_OUTLINE, "no");
- outlineContainer.setVisible(false);
+ outline.setVisible(false);
} else {
cookie = new Cookie(COOKIE_OUTLINE, "yes");
- outlineContainer.setVisible(true);
+ outline.setVisible(true);
}
cookie.setMaxAge(Integer.MAX_VALUE);
response.addCookie(cookie);
- target.add(outlineContainer);
+ target.add(outline);
target.appendJavaScript("gitplex.server.sourceView.onToggleOutline();");
}
@@ -263,7 +269,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
CompareContext compareContext = context.getOpenComment().getCompareContext();
return new CompareContextPanel(id, Model.of((PullRequest)null), new AbstractReadOnlyModel<CodeComment>() {
@@ -593,6 +599,16 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
target.appendJavaScript(script);
context.onCommentOpened(target, comment);
break;
+ case "outlineSearch":
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return newOutlineSearchPanel(id, this);
+ }
+
+ };
+ break;
case "syncOutline":
int line = params.getParameterValue("param1").toInt();
int ch = params.getParameterValue("param2").toInt();
@@ -614,13 +630,14 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
}
if (closest != null) {
@SuppressWarnings("unchecked")
- NestedTree<Symbol> tree = (NestedTree<Symbol>) outlineContainer.get(BODY_ID);
+ NestedTree<Symbol> tree = (NestedTree<Symbol>) outline.get(BODY_ID);
Symbol current = closest;
while (current != null) {
tree.expand(current);
current = current.getParent();
}
- script = String.format("gitplex.server.sourceView.syncOutline('%s');", getSymbolId(closest));
+ script = String.format("gitplex.server.sourceView.syncOutline('%s');",
+ getSymbolId(symbols, closest));
target.appendJavaScript(script);
}
break;
@@ -637,7 +654,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
}
});
- outlineContainer = new WebMarkupContainer("outline") {
+ outline = new WebMarkupContainer("outline") {
@Override
public void renderHead(IHeaderResponse response) {
@@ -646,7 +663,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
}
};
- outlineContainer.add(new AjaxLink<Void>("close") {
+ outline.add(new AjaxLink<Void>("close") {
@Override
public void onClick(AjaxRequestTarget target) {
@@ -654,34 +671,8 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
}
});
- NestedTree<Symbol> tree;
- outlineContainer.add(tree = new NestedTree<Symbol>(BODY_ID, new ITreeProvider<Symbol>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Iterator<? extends Symbol> getRoots() {
- return getChildSymbols(null).iterator();
- }
-
- @Override
- public boolean hasChildren(Symbol symbol) {
- return !getChildSymbols(symbol).isEmpty();
- }
-
- @Override
- public Iterator<? extends Symbol> getChildren(Symbol symbol) {
- return getChildSymbols(symbol).iterator();
- }
-
- @Override
- public IModel<Symbol> model(Symbol symbol) {
- return Model.of(symbol);
- }
-
- }) {
+
+ NestedTree<Symbol> tree = new NestedTree<Symbol>(BODY_ID, newSymbolTreeProvider(symbols)) {
@Override
protected void onInitialize() {
@@ -694,7 +685,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
Symbol symbol = nodeModel.getObject();
Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
- fragment.setMarkupId(getSymbolId(symbol));
+ fragment.setMarkupId(getSymbolId(symbols, symbol));
fragment.setOutputMarkupId(true);
fragment.add(symbol.renderIcon("icon"));
@@ -707,33 +698,23 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
}
};
- DepotBlobPage.State state = new DepotBlobPage.State(context.getBlobIdent());
- state.commentId = CodeComment.idOf(context.getOpenComment());
- state.mark = TextRange.of(symbol.getPosition());
- PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);
- link.add(AttributeAppender.replace("href", urlFor(DepotBlobPage.class, params).toString()));
link.add(symbol.render("label", null));
fragment.add(link);
return fragment;
}
- });
+ };
- for (Symbol root: getChildSymbols(null))
+ for (Symbol root: getChildSymbols(symbols, null))
tree.expand(root);
- outlineContainer.setOutputMarkupPlaceholderTag(true);
- add(outlineContainer);
+ outline.add(tree);
- if (!symbols.isEmpty()) {
- WebRequest request = (WebRequest) RequestCycle.get().getRequest();
- Cookie cookie = request.getCookie(COOKIE_OUTLINE);
- if (cookie!=null && cookie.getValue().equals("no"))
- outlineContainer.setVisible(false);
- } else {
- outlineContainer.setVisible(false);
- }
+ outline.setOutputMarkupPlaceholderTag(true);
+ add(outline);
+
+ outline.setVisible(isOutlineVisibleInitially());
add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Depot>() {
@@ -764,6 +745,16 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
});
}
+ private boolean isOutlineVisibleInitially() {
+ if (!symbols.isEmpty()) {
+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();
+ Cookie cookie = request.getCookie(COOKIE_OUTLINE);
+ return cookie==null || !cookie.getValue().equals("no");
+ } else {
+ return false;
+ }
+ }
+
private boolean contains(TokenPosition scope, int line, int ch) {
int fromLine = scope.getFromLine();
int toLine = scope.getToLine();
@@ -814,7 +805,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
context.onCommentOpened(target, null);
}
- private List<Symbol> getChildSymbols(@Nullable Symbol parentSymbol) {
+ private List<Symbol> getChildSymbols(List<Symbol> symbols, @Nullable Symbol parentSymbol) {
List<Symbol> children = new ArrayList<>();
for (Symbol symbol: symbols) {
if (symbol.getOutlineParent() == parentSymbol)
@@ -948,7 +939,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
List<Range> ranges;
}
- private String getSymbolId(Symbol symbol) {
+ private String getSymbolId(List<Symbol> symbols, Symbol symbol) {
return "outline-symbol-" + symbols.indexOf(symbol);
}
@@ -981,5 +972,206 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
}
target.appendJavaScript(script);
}
+
+ private ITreeProvider<Symbol> newSymbolTreeProvider(List<Symbol> symbols) {
+ return new ITreeProvider<Symbol>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Iterator<? extends Symbol> getRoots() {
+ return getChildSymbols(symbols, null).iterator();
+ }
+
+ @Override
+ public boolean hasChildren(Symbol symbol) {
+ return !getChildSymbols(symbols, symbol).isEmpty();
+ }
+
+ @Override
+ public Iterator<? extends Symbol> getChildren(Symbol symbol) {
+ return getChildSymbols(symbols, symbol).iterator();
+ }
+
+ @Override
+ public IModel<Symbol> model(Symbol symbol) {
+ return Model.of(symbol);
+ }
+
+ };
+ }
+
+ private boolean matches(Symbol symbol, @Nullable String searchInput) {
+ if (searchInput != null)
+ return symbol.getName().toLowerCase().startsWith(searchInput.trim().toLowerCase());
+ else
+ return true;
+ }
+
+ private NestedTree<Symbol> newOutlineSearchSymbolTree(ModalPanel modal, List<Symbol> symbols,
+ @Nullable String searchInput) {
+ NestedTree<Symbol> tree = new NestedTree<Symbol>("result", newSymbolTreeProvider(symbols)) {
+
+ private boolean matchFound;
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new HumanTheme());
+ }
+
+ @Override
+ protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
+ Symbol symbol = nodeModel.getObject();
+
+ Fragment fragment = new Fragment(id, "outlineSearchNodeFrag", SourceViewPanel.this);
+ fragment.setOutputMarkupId(true);
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ context.onSelect(target, context.getBlobIdent(), symbol.getPosition());
+ }
+
+ };
+ link.add(symbol.renderIcon("icon"));
+ link.add(symbol.render("label", null));
+ link.add(AttributeAppender.append("data-symbolindex", symbols.indexOf(symbol)));
+
+ fragment.add(link);
+
+ if (!matchFound && matches(symbol, searchInput)) {
+ link.add(AttributeAppender.append("class", "active"));
+ matchFound = true;
+ }
+
+ return fragment;
+ }
+
+ };
+
+ for (Symbol root: getChildSymbols(symbols, null))
+ tree.expand(root);
+
+ tree.setOutputMarkupId(true);
+
+ return tree;
+ }
+
+ private Component newOutlineSearchPanel(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "outlineSearchFrag", SourceViewPanel.this);
+ fragment.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+
+ TextField<String> searchField = new TextField<>("input");
+ fragment.add(searchField);
+ fragment.add(newOutlineSearchSymbolTree(modal, symbols, null));
+
+ fragment.add(new AbstractPostAjaxBehavior() {
+
+ private List<Symbol> filteredSymbols = new ArrayList<Symbol>(symbols);
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setChannel(new AjaxChannel("outline-search-input", AjaxChannel.Type.DROP));
+ }
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ String key = params.getParameterValue("key").toString();
+
+ if (key.equals("input")) {
+ String searchInput = params.getParameterValue("param").toString();
+ filteredSymbols = new ArrayList<>();
+ for (Symbol symbol: symbols) {
+ if (matches(symbol, searchInput)) {
+ Symbol current = symbol;
+ do {
+ if (!filteredSymbols.contains(current))
+ filteredSymbols.add(current);
+ current = current.getOutlineParent();
+ } while (current != null);
+ }
+ }
+ NestedTree<Symbol> tree = newOutlineSearchSymbolTree(modal, filteredSymbols, searchInput);
+ fragment.replace(tree);
+ target.add(tree);
+ } else if (key.equals("return")) {
+ int symbolIndex = params.getParameterValue("param").toInt();
+ Symbol symbol = filteredSymbols.get(symbolIndex);
+ context.onSelect(target, context.getBlobIdent(), symbol.getPosition());
+ modal.close();
+ } else {
+ throw new IllegalStateException("Unrecognized key: " + key);
+ }
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ String script = String.format(
+ "gitplex.server.sourceView.onOutlineSearchDomReady('%s', %s);",
+ fragment.getMarkupId(),
+ getCallbackFunction(explicit("key"), explicit("param")));
+
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
+ }
+
+ @Override
+ public List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ if (!symbols.isEmpty()) {
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getShortcut() {
+ return "Alt+Shift+O";
+ }
+
+ @Override
+ public String getLabel() {
+ return "Outline Search";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return newOutlineSearchPanel(id, modal);
+ }
+
+ };
+ }
+
+ });
+ }
+ return menuItems;
+ }
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
index eb7bb508b4..18329fa81b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
@@ -8,6 +8,8 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;
import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.js.doneevents.DoneEventsResourceReference;
+import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;
import com.gitplex.server.web.assets.js.hover.HoverResourceReference;
import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;
import com.gitplex.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;
@@ -30,6 +32,8 @@ public class SourceViewResourceReference extends BaseDependentResourceReference
dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));
dependencies.add(CssHeaderItem.forReference(
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
index 571f961e6e..7a1f0e2eac 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
@@ -39,7 +39,7 @@ gitplex.server.sourceEdit = {
cm.oldDocValue = cm.doc.getValue();
- gitplex.server.codemirror.bindKeys(cm);
+ gitplex.server.codemirror.bindShortcuts(cm);
var doneTimer;
cm.on("change", function() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
index baf9243164..78b5859f2e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
@@ -142,3 +142,9 @@
.CodeMirror-activeline .CodeMirror-annotation {
background: #E8F2FE;
}
+
+.outline-search .result {
+ margin-top: 20px;
+ height: 400px;
+ overflow: auto;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
index 0dcfd07b2b..e8ccf7b77b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
@@ -50,7 +50,20 @@ gitplex.server.sourceView = {
}
gitplex.server.sourceView.highlightCommentTrigger();
- gitplex.server.codemirror.bindKeys(cm);
+ gitplex.server.codemirror.bindShortcuts(cm);
+
+ if (!($(document).data("SourceViewShortcutsBinded"))) {
+ $(document).data("SourceViewShortcutsBinded", true);
+
+ document.addEventListener("keydown", function(e) {
+ if (e.altKey && e.shiftKey && e.keyCode === 79 && $(".modal:visible").length == 0) {
+ e.preventDefault();
+ var $sourceView = $(".source-view");
+ if ($sourceView.length != 0)
+ $sourceView.data("callback")("outlineSearch");
+ }
+ });
+ }
$code.selectionPopover("init", function() {
if (cm.hasFocus()) {
@@ -427,7 +440,7 @@ gitplex.server.sourceView = {
onToggleOutline: function() {
gitplex.server.sourceView.exitFullScreen();
gitplex.server.sourceView.onLayoutChange();
- $(".outline-toggle").toggleClass("active");
+ $(".outline-toggle").prop("checked", $(".source-view>.outline").is(":visible"));
},
highlightCommentTrigger: function() {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
@@ -545,5 +558,58 @@ gitplex.server.sourceView = {
onTabSizeChange: function(tabSize) {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
cm.setOption("tabSize", tabSize);
+ },
+ onOutlineSearchDomReady: function(containerId, callback) {
+ var $body = $("#" + containerId + ">.outline-search>.modal-body");
+
+ var $input = $body.children("input");
+
+ $input.doneEvents("inputchange", function() {
+ callback("input", $(this).val());
+ }, 100);
+
+ function onReturn() {
+ if (gitplex.server.form.confirmLeave()) {
+ var $result = $body.children(".result");
+ var $active = $result.find("a.active");
+ if ($active.length != 0) {
+ callback("return", $active.data("symbolindex"));
+ }
+ }
+ }
+
+ function onKeyup(e) {
+ e.preventDefault();
+ var $result = $body.children(".result");
+ var $active = $result.find("a.active");
+ var $selectables = $result.find("a.selectable");
+ var index = $selectables.index($active);
+ if (index > 0) {
+ index--;
+ var $prev = $selectables.eq(index);
+ $active.removeClass("active");
+ $prev.addClass("active");
+ $result.scrollIntoView("a.active", 36, 36);
+ }
+ };
+
+ function onKeydown(e) {
+ e.preventDefault();
+ var $result = $body.children(".result");
+ var $active = $result.find("a.active");
+ var $selectables = $result.find("a.selectable");
+ var index = $selectables.index($active);
+ if (index < $selectables.length-1) {
+ index++;
+ var $next = $selectables.eq(index);
+ $active.removeClass("active");
+ $next.addClass("active");
+ $result.scrollIntoView("a.active", 36, 36);
+ }
+ };
+
+ $body.children().bind("keydown", "return", onReturn);
+ $body.children().bind("keydown", "up", onKeyup);
+ $body.children().bind("keydown", "down", onKeydown);
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
index de2f8c4540..7dbcf064d6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
@@ -10,25 +10,16 @@
</wicket:enclosure>
<span wicket:id="size"></span>
</div>
- <div class="pull-right actions clearfix">
- <div wicket:id="options" class="options pull-left"></div>
- <wicket:enclosure child="changeActions">
- <div class="change pull-left">
- <div wicket:id="changeActions" class="btn-group">
- <a wicket:id="edit" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a>
- <a wicket:id="delete" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Delete</a>
- </div>
- </div>
- </wicket:enclosure>
- <div class="others pull-left">
- <div class="btn-group">
- <a wicket:id="raw" class="btn btn-default btn-sm"><i class="fa fa-file-o"></i> Raw</a>
- <a wicket:id="blame" class="btn btn-default btn-sm"><i class="fa fa-user"></i> Blame</a>
- <a wicket:id="history" class="btn btn-default btn-sm"><i class="fa fa-history"></i> History</a>
- <wicket:container wicket:id="extraActions"></wicket:container>
- </div>
- </div>
+ <div class="pull-right actions">
+ <wicket:container wicket:id="changeActions">
+ <a wicket:id="edit"><i class="fa fa-pencil"></i> Edit</a>
+ <a wicket:id="delete"><i class="fa fa-trash"></i> Delete</a>
+ </wicket:container>
+ <a wicket:id="raw"><i class="fa fa-file-o"></i> Raw</a>
+ <input type="checkbox" wicket:id="blame"> Blame</input>
+ <wicket:container wicket:id="extraActions"></wicket:container>
</div>
+ <div wicket:id="options" class="pull-right options"></div>
</div>
<div class="body">
<wicket:child></wicket:child>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
index dfa55aed8b..ab967eff9d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
@@ -4,6 +4,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -12,19 +14,20 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.Model;
import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;
-import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import com.gitplex.server.web.util.ajaxlistener.TrackViewStateListener;
import com.gitplex.server.web.util.resource.RawBlobResource;
import com.gitplex.server.web.util.resource.RawBlobResourceReference;
import com.google.common.base.Preconditions;
@@ -156,13 +159,7 @@ public abstract class BlobViewPanel extends Panel {
add(new ResourceLink<Void>("raw", new RawBlobResourceReference(),
RawBlobResource.paramsOf(context.getDepot(), context.getBlobIdent())));
- add(new ViewStateAwareAjaxLink<Void>("blame", true) {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
+ add(new CheckBox("blame", Model.of(context.getMode() == Mode.BLAME)) {
@Override
protected void onConfigure() {
@@ -170,32 +167,26 @@ public abstract class BlobViewPanel extends Panel {
setVisible(context.getDepot().getBlob(context.getBlobIdent()).getText() != null);
}
+ }.add(new OnChangeAjaxBehavior() {
+
@Override
- public void onClick(AjaxRequestTarget target) {
- if (context.getMode() == Mode.BLAME)
- context.onModeChange(target, Mode.VIEW);
- else
- context.onModeChange(target, Mode.BLAME);
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setMethod(Method.POST);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ attributes.getAjaxCallListeners().add(new TrackViewStateListener(true));
}
-
- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
-
+
@Override
- public String getObject() {
+ protected void onUpdate(AjaxRequestTarget target) {
if (context.getMode() == Mode.BLAME)
- return "active";
+ context.onModeChange(target, Mode.VIEW);
else
- return "";
+ context.onModeChange(target, Mode.BLAME);
}
- })));
+ }));
- DepotCommitsPage.State state = new DepotCommitsPage.State();
- state.compareWith = context.getCommit().name();
- state.query = String.format("path(%s)", context.getBlobIdent().path);
- add(new ViewStateAwarePageLink<>("history", DepotCommitsPage.class,
- DepotCommitsPage.paramsOf(context.getDepot(), state)));
-
add(newAdditionalActions("extraActions"));
newChangeActions(null);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
index 5e8856def2..e40a9fc5e5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
@@ -1,12 +1,11 @@
.blob-view>.head {
border-bottom: 1px solid #BBB;
- padding: 4px 12px;
+ padding: 4px 8px;
}
.blob-view>.body {
overflow: auto;
}
.blob-view>.head>.info {
- margin-top: 4px;
color: #666;
}
.blob-view>.head>.info .separator {
@@ -15,6 +14,11 @@
.blob-view>.head>.actions {
white-space: nowrap;
}
-.blob-view>.head>.actions>div {
+.blob-view>.head>.actions>* {
+ color: #333;
margin-left: 12px;
+ margin-right: 0;
+}
+.blob-view>.head>.actions>input {
+ vertical-align: top;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/SearchMenuContributor.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/SearchMenuContributor.java
new file mode 100644
index 0000000000..f7db9f7da3
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/SearchMenuContributor.java
@@ -0,0 +1,12 @@
+package com.gitplex.server.web.page.depot.blob.search;
+
+import java.util.List;
+
+import com.gitplex.server.web.component.floating.FloatingPanel;
+import com.gitplex.server.web.component.menu.MenuItem;
+
+public interface SearchMenuContributor {
+
+ List<MenuItem> getMenuItems(FloatingPanel dropdown);
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html
index 862d1b03cb..5d087a661e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.html
@@ -1,17 +1,16 @@
<wicket:panel>
<form wicket:id="form" class="advanced-search">
<div class="modal-header">
- <h4 class="modal-title">Advanced Search</h4>
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 class="modal-title">Text and Advanced Search</h4>
</div>
<div class="modal-body">
<ul wicket:id="tabs" class="nav nav-tabs"></ul>
<div wicket:id="searchOptions"></div>
</div>
<div class="modal-footer">
- <div class="form-group">
- <button wicket:id="search" class="btn btn-primary">Search</button>
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
+ <button wicket:id="search" class="btn btn-primary">Search</button>
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
</div>
</form>
<wicket:fragment wicket:id="symbolSearchFrag">
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.java
index b24f48f9bd..586c665769 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.java
@@ -96,6 +96,15 @@ public abstract class AdvancedSearchPanel extends Panel {
form.setOutputMarkupId(true);
add(form);
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
List<Tab> tabs = new ArrayList<Tab>();
tabs.add(new AjaxActionTab(Model.of("Text occurrences")) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.html
deleted file mode 100644
index bf70c355bb..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<wicket:panel>
- <span class="instant-search">
- <input wicket:id="input" placeholder="Find symbols or files" class="form-control input-sm"/>
- <a title="Instant search of symbols and files" onclick="if (!$(this).prev().is(':visible')) $(this).prev().show().focus();"><i class="fa fa-search"></i></a>
- </span>
- <wicket:fragment wicket:id="resultFrag">
- <div class="instant-search-result">
- <wicket:enclosure child="symbolHits">
- <ul class="list-unstyled">
- <li wicket:id="symbolHits" class="hit selectable">
- <a wicket:id="link">
- <span class="icon"><img wicket:id="icon"></img></span>
- <span wicket:id="label" class="text"></span>
- <wicket:enclosure child="scope">
- <span class="scope">
- -- <span wicket:id="scope"></span>
- </span>
- </wicket:enclosure>
- </a>
- </li>
- <wicket:enclosure child="moreSymbolHits">
- <li class="hit selectable more-matches">
- <a wicket:id="moreSymbolHits">
- <span class="icon"><wicket:link><img src="point.png"></img></wicket:link></span>
- <em class="text">Show more</em>
- </a>
- </li>
- </wicket:enclosure>
- </ul>
- </wicket:enclosure>
- <em wicket:id="noMatches"><i class="fa fa-info-circle"></i> No any matches</em>
- </div>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.css
deleted file mode 100644
index 10ec3954e9..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.instant-search input.form-control {
- width: 200px;
- display: none;
- cursor: text;
- margin-right: 8px;
-}
-.instant-search a {
- color: #666;
-}
-.instant-search-result {
- padding: 12px;
-}
-.instant-search-result ul {
- margin-bottom: 0;
-}
-.instant-search-result li.hit .scope {
- color: #666;
- font-size: 12px;
-}
-.instant-search-dropdown.floating {
- max-width: 600px;
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.js
deleted file mode 100644
index a76d8ce507..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.js
+++ /dev/null
@@ -1,84 +0,0 @@
-gitplex.server.blobInstantSearch = {
- init: function(inputId, callback) {
- var $input = $("#" + inputId);
-
- $input.doneEvents("inputchange focus click", function() {
- callback("input", $(this).val());
- }, 100);
- $input.on("blur", function() {
- if ($input.data("hint") == null && $input.is(":visible")) {
- // in case user clicks advanced button while the
- // instant input is shown, we need to hide the
- // input after a timeout in order not to make
- // the advanced button moving to lost the click
- setTimeout(function(){$input.hide();}, 250);
- }
- });
- $input.bind("keydown", "esc", function() {
- $input.hide();
- });
-
- $input.data("return", function() {
- if (gitplex.server.form.confirmLeave()) {
- var $hint = $input.data("hint");
- if ($hint != null) {
- var $active = $hint.find("li.hit.active");
- if ($active.length != 0) {
- callback("return", $active.index());
- }
- }
- }
- });
- $input.data("keyup", function(e) {
- var $hint = $input.data("hint");
- if ($hint != null) {
- e.preventDefault();
- var $active = $hint.find("li.hit.active");
- var $prev = $active.prev("li.hit");
- if ($prev.length != 0) {
- $active.removeClass("active");
- $prev.addClass("active");
- }
- $hint.scrollIntoView("li.hit.active", 36, 36);
- }
- });
- $input.data("keydown", function(e) {
- var $hint = $input.data("hint");
- if ($hint != null) {
- e.preventDefault();
- var $active = $hint.find("li.hit.active");
- var $next = $active.next("li.hit");
- if ($next.length != 0) {
- $active.removeClass("active");
- $next.addClass("active");
- }
- $hint.scrollIntoView("li.hit.active", 36, 36);
- }
- });
- $input.bind("keydown", "return", $input.data("return"));
- $input.bind("keydown", "up", $input.data("keyup"));
- $input.bind("keydown", "down", $input.data("keydown"));
- },
-
- hintOpened: function(inputId, hintId) {
- var $input = $("#" + inputId);
- var $hint = $("#" + hintId);
- $hint.bind("keydown", "up", $input.data("keyup"));
- $hint.bind("keydown", "down", $input.data("keydown"));
- $hint.bind("keydown", "return", $input.data("return"));
-
- $hint.on("close", function() {
- if (!$input.is(":focus") && $input.is(":visible")) {
- // in case user clicks advanced button while the
- // instant input is shown, we need to hide the
- // input after a timeout in order not to make
- // the advanced button moving to lost the click
- setTimeout(function(){$input.hide();}, 250);
- }
- $input.data("hint", null);
- });
-
- $input.data("hint", $hint);
- }
-
-};
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.html
new file mode 100644
index 0000000000..ca799496b3
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.html
@@ -0,0 +1,42 @@
+<wicket:panel>
+ <div class="quick-search">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 class="modal-title">File and Symbol Search</h4>
+ </div>
+ <div class="modal-body">
+ <input wicket:id="input" class="form-control autofocus"></input>
+ <div wicket:id="result" class="result">
+ <wicket:enclosure child="symbolHits">
+ <ul class="list-unstyled">
+ <li wicket:id="symbolHits" class="hit selectable">
+ <a wicket:id="link">
+ <span class="icon"><img wicket:id="icon"></img></span>
+ <span wicket:id="label" class="text"></span>
+ <wicket:enclosure child="scope">
+ <span class="scope">
+ -- <span wicket:id="scope"></span>
+ </span>
+ </wicket:enclosure>
+ </a>
+ </li>
+ <wicket:enclosure child="moreSymbolHits">
+ <li class="hit selectable more-matches">
+ <a wicket:id="moreSymbolHits">
+ <span class="icon"><wicket:link><img src="point.png"></img></wicket:link></span>
+ <em class="text">Show more</em>
+ </a>
+ </li>
+ </wicket:enclosure>
+ </ul>
+ </wicket:enclosure>
+ <div wicket:id="noMatches" class="no-matches"><i class="fa fa-info-circle"></i> No any matches</div>
+ <ul wicket:id="help" class="help">
+ <li>Type to search</li>
+ <li>Use <i class="fa fa-long-arrow-up"></i><i class="fa fa-long-arrow-down"></i> to navigate in the result</li>
+ <li>Hit <i class="fa fa-level-down fa-rotate-90"></i> to select</li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.java
similarity index 62%
rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.java
rename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.java
index 1b4a64fedb..a2b46bb7f2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchPanel.java
@@ -1,10 +1,12 @@
-package com.gitplex.server.web.page.depot.blob.search.instant;
+package com.gitplex.server.web.page.depot.blob.search.quick;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nullable;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxChannel;
@@ -21,7 +23,6 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
@@ -44,34 +45,27 @@ import com.gitplex.server.search.query.TooGeneralQueryException;
import com.gitplex.server.util.StringUtils;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.behavior.RunTaskBehavior;
-import com.gitplex.server.web.component.floating.AlignPlacement;
-import com.gitplex.server.web.component.floating.ComponentTarget;
-import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
-public abstract class InstantSearchPanel extends Panel {
+public abstract class QuickSearchPanel extends Panel {
private static final int MAX_QUERY_ENTRIES = 15;
- final IModel<Depot> depotModel;
-
- final IModel<String> revisionModel;
+ private final IModel<Depot> depotModel;
- private TextField<String> searchField;
+ private final IModel<String> revisionModel;
private String searchInput;
- private FloatingPanel searchHint;
-
- private List<QueryHit> symbolHits;
+ private List<QueryHit> symbolHits = new ArrayList<>();
private RunTaskBehavior moreSymbolHitsBehavior;
- public InstantSearchPanel(String id, IModel<Depot> depotModel, IModel<String> revisionModel) {
+ public QuickSearchPanel(String id, IModel<Depot> depotModel, IModel<String> revisionModel) {
super(id);
this.depotModel = depotModel;
@@ -150,13 +144,25 @@ public abstract class InstantSearchPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- searchField = new TextField<>("input");
- searchField.add(new AbstractPostAjaxBehavior() {
+ add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ TextField<String> searchField = new TextField<>("input");
+ add(searchField);
+ newSearchResult(null);
+
+ add(new AbstractPostAjaxBehavior() {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.setChannel(new AjaxChannel("blob-instant-search-input", AjaxChannel.Type.DROP));
+ attributes.setChannel(new AjaxChannel("blob-quick-search-input", AjaxChannel.Type.DROP));
}
@Override
@@ -168,16 +174,10 @@ public abstract class InstantSearchPanel extends Panel {
searchInput = params.getParameterValue("param").toString();
if (StringUtils.isNotBlank(searchInput)) {
symbolHits = querySymbols(searchInput, MAX_QUERY_ENTRIES);
- if (searchHint == null)
- newSearchHint(target);
- else
- target.add(searchHint.getContent());
} else {
symbolHits = new ArrayList<>();
-
- if (searchHint != null)
- searchHint.close();
}
+ newSearchResult(target);
} else if (key.equals("return")) {
int activeHitIndex = params.getParameterValue("param").toInt();
QueryHit activeHit = getActiveHit(activeHitIndex);
@@ -185,7 +185,7 @@ public abstract class InstantSearchPanel extends Panel {
if (activeHit instanceof MoreSymbolHit)
moreSymbolHitsBehavior.requestRun(target);
else
- selectHit(target, activeHit);
+ onSelect(target, activeHit);
}
} else {
throw new IllegalStateException("Unrecognized key: " + key);
@@ -196,136 +196,127 @@ public abstract class InstantSearchPanel extends Panel {
public void renderHead(Component component, IHeaderResponse response) {
super.renderHead(component, response);
String script = String.format(
- "gitplex.server.blobInstantSearch.init('%s', %s);",
- searchField.getMarkupId(),
+ "gitplex.server.onQuickSearchDomReady('%s', %s);",
+ getMarkupId(),
getCallbackFunction(explicit("key"), explicit("param")));
response.render(OnDomReadyHeaderItem.forScript(script));
}
});
- searchField.setOutputMarkupId(true);
- add(searchField);
+
+ setOutputMarkupId(true);
}
- private void newSearchHint(AjaxRequestTarget target) {
- searchHint = new FloatingPanel(target, new ComponentTarget(searchField), AlignPlacement.bottom(0)) {
+ private void newSearchResult(@Nullable AjaxRequestTarget target) {
+ WebMarkupContainer result = new WebMarkupContainer("result");
+ result.setOutputMarkupId(true);
+
+ result.add(new ListView<QueryHit>("symbolHits", new AbstractReadOnlyModel<List<QueryHit>>() {
@Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "instant-search-dropdown"));
+ public List<QueryHit> getObject() {
+ return symbolHits;
}
+
+ }) {
@Override
- protected Component newContent(String id) {
- WebMarkupContainer searchResult = new Fragment(id, "resultFrag", InstantSearchPanel.this);
- searchResult.setOutputMarkupId(true);
-
- searchResult.add(new ListView<QueryHit>("symbolHits", new AbstractReadOnlyModel<List<QueryHit>>() {
-
- @Override
- public List<QueryHit> getObject() {
- return symbolHits;
- }
-
- }) {
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!symbolHits.isEmpty());
+ }
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!symbolHits.isEmpty());
- }
+ @Override
+ protected void populateItem(ListItem<QueryHit> item) {
+ QueryHit hit = item.getModelObject();
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
@Override
- protected void populateItem(ListItem<QueryHit> item) {
- QueryHit hit = item.getModelObject();
- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- selectHit(target, hit);
- }
-
- };
- link.add(hit.renderIcon("icon"));
- link.add(hit.render("label"));
- link.add(new Label("scope", hit.getNamespace()).setVisible(hit.getNamespace()!=null));
- item.add(link);
-
- BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),
- FileMode.REGULAR_FILE.getBits());
- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);
- state.mark = TextRange.of(hit.getTokenPos());
- PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), state);
- CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);
- link.add(AttributeAppender.replace("href", url.toString()));
-
- if (item.getIndex() == 0)
- item.add(AttributeModifier.append("class", "active"));
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
}
- });
- searchResult.add(new AjaxLink<Void>("moreSymbolHits") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(moreSymbolHitsBehavior = new RunTaskBehavior() {
-
- @Override
- protected void runTask(AjaxRequestTarget target) {
- List<QueryHit> hits = querySymbols(searchInput, SearchResultPanel.MAX_QUERY_ENTRIES);
- onMoreQueried(target, hits);
- close();
- }
-
- });
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(symbolHits.size() == MAX_QUERY_ENTRIES);
- }
-
@Override
public void onClick(AjaxRequestTarget target) {
- moreSymbolHitsBehavior.requestRun(target);
+ onSelect(target, hit);
}
- });
-
- searchResult.add(new WebMarkupContainer("noMatches") {
+ };
+ link.add(hit.renderIcon("icon"));
+ link.add(hit.render("label"));
+ link.add(new Label("scope", hit.getNamespace()).setVisible(hit.getNamespace()!=null));
+ item.add(link);
+
+ BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),
+ FileMode.REGULAR_FILE.getBits());
+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);
+ state.mark = TextRange.of(hit.getTokenPos());
+ PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), state);
+ CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);
+ link.add(AttributeAppender.replace("href", url.toString()));
+
+ if (item.getIndex() == 0)
+ item.add(AttributeModifier.append("class", "active"));
+ }
+
+ });
+ result.add(new AjaxLink<Void>("moreSymbolHits") {
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(moreSymbolHitsBehavior = new RunTaskBehavior() {
+
@Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(symbolHits.isEmpty());
+ protected void runTask(AjaxRequestTarget target) {
+ List<QueryHit> hits = querySymbols(searchInput, SearchResultPanel.MAX_QUERY_ENTRIES);
+ onMoreQueried(target, hits);
}
});
-
- return searchResult;
}
@Override
- protected void onClosed() {
- super.onClosed();
- searchHint = null;
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(symbolHits.size() == MAX_QUERY_ENTRIES);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ moreSymbolHitsBehavior.requestRun(target);
}
- };
+ });
- String script = String.format("gitplex.server.blobInstantSearch.hintOpened('%s', '%s');",
- searchField.getMarkupId(true), searchHint.getMarkupId(true));
- target.appendJavaScript(script);
+ result.add(new WebMarkupContainer("noMatches") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(StringUtils.isNotBlank(searchInput) && symbolHits.isEmpty());
+ }
+
+ });
+
+ result.add(new WebMarkupContainer("help") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(StringUtils.isBlank(searchInput) && symbolHits.isEmpty());
+ }
+
+ });
+
+ if (target != null) {
+ replace(result);
+ target.add(result);
+ } else {
+ add(result);
+ }
}
private QueryHit getActiveHit(int activeHitIndex) {
@@ -347,7 +338,7 @@ public abstract class InstantSearchPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new InstantSearchResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new QuickSearchResourceReference()));
}
@Override
@@ -358,12 +349,7 @@ public abstract class InstantSearchPanel extends Panel {
super.onDetach();
}
- private void selectHit(AjaxRequestTarget target, QueryHit hit) {
- target.appendJavaScript(String.format("$('#%s').hide();", searchField.getMarkupId(true)));
- if (searchHint != null)
- searchHint.close();
- onSelect(target, hit);
- }
+ protected abstract void onCancel(AjaxRequestTarget target);
protected abstract void onSelect(AjaxRequestTarget target, QueryHit hit);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchResourceReference.java
similarity index 72%
rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchResourceReference.java
index d2caeb508a..c1e7a56941 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/QuickSearchResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.page.depot.blob.search.instant;
+package com.gitplex.server.web.page.depot.blob.search.quick;
import java.util.List;
@@ -12,12 +12,12 @@ import com.gitplex.server.web.assets.js.scrollintoview.ScrollIntoViewResourceRef
import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
-public class InstantSearchResourceReference extends BaseDependentResourceReference {
+public class QuickSearchResourceReference extends BaseDependentResourceReference {
private static final long serialVersionUID = 1L;
- public InstantSearchResourceReference() {
- super(InstantSearchResourceReference.class, "instant-search.js");
+ public QuickSearchResourceReference() {
+ super(QuickSearchResourceReference.class, "quick-search.js");
}
@Override
@@ -26,7 +26,8 @@ public class InstantSearchResourceReference extends BaseDependentResourceReferen
dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(InstantSearchResourceReference.class, "instant-search.css")));
+ dependencies.add(CssHeaderItem.forReference(
+ new BaseDependentCssResourceReference(QuickSearchResourceReference.class, "quick-search.css")));
return dependencies;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/point.png b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/point.png
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/point.png
rename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/point.png
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.css
new file mode 100644
index 0000000000..16686ec39f
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.css
@@ -0,0 +1,16 @@
+.quick-search .result {
+ margin-top: 16px;
+ height: 400px;
+ overflow: auto;
+}
+.quick-search .result ul {
+ margin-bottom: 0;
+}
+.quick-search .result li.hit .scope {
+ color: #666;
+ font-size: 12px;
+}
+.quick-search .no-matches, .quick-search .help {
+ font-size: 16px;
+ color: #666;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.js
new file mode 100644
index 0000000000..1feb8a423e
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/quick/quick-search.js
@@ -0,0 +1,48 @@
+gitplex.server.onQuickSearchDomReady = function(containerId, callback) {
+ var $body = $("#" + containerId + ">.quick-search>.modal-body");
+
+ var $input = $body.children("input");
+
+ $input.doneEvents("inputchange", function() {
+ callback("input", $(this).val());
+ }, 100);
+
+ function onReturn() {
+ if (gitplex.server.form.confirmLeave()) {
+ var $result = $body.children(".result");
+ var $active = $result.find("li.hit.active");
+ if ($active.length != 0) {
+ callback("return", $active.index());
+ }
+ }
+ }
+
+ function onKeyup(e) {
+ e.preventDefault();
+ var $result = $body.children(".result");
+ var $active = $result.find("li.hit.active");
+ var $prev = $active.prev("li.hit");
+ if ($prev.length != 0) {
+ $active.removeClass("active");
+ $prev.addClass("active");
+ }
+ $result.scrollIntoView("li.hit.active", 36, 36);
+ };
+
+ function onKeydown(e) {
+ e.preventDefault();
+ var $result = $body.children(".result");
+ var $active = $result.find("li.hit.active");
+ var $next = $active.next("li.hit");
+ if ($next.length != 0) {
+ $active.removeClass("active");
+ $next.addClass("active");
+ }
+ $result.scrollIntoView("li.hit.active", 36, 36);
+ };
+
+ $body.children().bind("keydown", "return", onReturn);
+ $body.children().bind("keydown", "up", onKeyup);
+ $body.children().bind("keydown", "down", onKeydown);
+
+};
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
index 36734bc267..288400d92b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
@@ -65,6 +65,7 @@ import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;
import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.revisionpicker.RevisionPicker;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
@@ -328,7 +329,7 @@ public class DepotBranchesPage extends DepotPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
Fragment fragment = new Fragment(id, "createBranchFrag", DepotBranchesPage.this);
Form<?> form = new Form<Void>("form");
form.setOutputMarkupId(true);
@@ -376,7 +377,7 @@ public class DepotBranchesPage extends DepotPage {
target.add(form);
} else {
depotModel.getObject().createBranch(branchName, branchRevision);
- closeModal();
+ modal.close();
target.add(branchesContainer);
target.add(pagingNavigator);
target.add(noBranchesContainer);
@@ -390,7 +391,7 @@ public class DepotBranchesPage extends DepotPage {
@Override
public void onClick(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
});
@@ -634,7 +635,7 @@ public class DepotBranchesPage extends DepotPage {
actionsContainer.add(new ModalLink("delete") {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
Fragment fragment = new Fragment(id, "confirmDeleteBranchFrag", DepotBranchesPage.this);
PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);
if (!pullRequestManager.findAllOpen(new DepotAndBranch(getDepot(), branch)).isEmpty()) {
@@ -661,7 +662,7 @@ public class DepotBranchesPage extends DepotPage {
target.add(pagingNavigator);
target.add(branchesContainer);
target.add(noBranchesContainer);
- closeModal();
+ modal.close();
}
});
@@ -669,7 +670,7 @@ public class DepotBranchesPage extends DepotPage {
@Override
public void onClick(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/depot-commits.css b/web/src/main/java/com/gitplex/server/web/page/depot/commit/depot-commits.css
index 5d50406804..4b19931728 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/depot-commits.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/depot-commits.css
@@ -7,7 +7,6 @@
}
#repo-commits>.body .no-commits {
- font-style: italic;
font-size: 16px;
}
#repo-commits>.body li {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
index 8755c37e20..5b4f31c897 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
@@ -24,10 +24,12 @@ import com.gitplex.server.model.Depot;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.depotselector.DepotSelector;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.markdown.MarkdownViewer;
import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;
import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;
@@ -137,7 +139,7 @@ public abstract class MoreInfoPanel extends Panel {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new DepotSelector(id, new LoadableDetachableModel<Collection<Depot>>() {
@Override
@@ -167,12 +169,12 @@ public abstract class MoreInfoPanel extends Panel {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
return new ForkOptionPanel(id, depotModel) {
@Override
protected void onClose(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
index fa81f5db90..dc4bc41d7e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
@@ -68,6 +68,7 @@ import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.AccountLink;
import com.gitplex.server.web.component.link.BranchLink;
import com.gitplex.server.web.component.link.DropdownLink;
@@ -439,7 +440,7 @@ public abstract class RequestDetailPage extends DepotPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new ResolveConflictInstructionPanel(id, new EntityModel<PullRequest>(getPullRequest()));
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
index de3da48bb0..ba2cb693e1 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
@@ -46,6 +46,7 @@ import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.component.diff.revision.CommentSupport;
import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;
@@ -224,7 +225,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
DropdownLink selectedCommitsLink = new DropdownLink("comparingCommits") {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
AbstractPostAjaxBehavior callbackBehavior = new AbstractPostAjaxBehavior() {
@Override
@@ -235,7 +236,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
target.add(head);
newRevisionDiff(target);
pushState(target);
- closeDropdown();
+ dropdown.close();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
index 67821de186..91cc8f9fc3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
@@ -39,6 +39,7 @@ import com.gitplex.server.model.PullRequest;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityCriteria;
import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.AccountLink;
import com.gitplex.server.web.component.link.BranchLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
@@ -85,19 +86,14 @@ public class RequestListPage extends DepotPage {
add(new MenuLink("filters") {
@Override
- protected List<MenuItem> getMenuItems() {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
Account currentUser = GitPlex.getInstance(AccountManager.class).getCurrent();
if (currentUser != null) {
- final String userName = currentUser.getName();
+ String userName = currentUser.getName();
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "Open requests assigned to me";
@@ -122,11 +118,6 @@ public class RequestListPage extends DepotPage {
});
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "Open requests submitted by me";
@@ -152,11 +143,6 @@ public class RequestListPage extends DepotPage {
}
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "All open requests";
@@ -180,11 +166,6 @@ public class RequestListPage extends DepotPage {
});
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "Incoming open requests";
@@ -209,11 +190,6 @@ public class RequestListPage extends DepotPage {
});
menuItems.add(new MenuItem() {
- @Override
- public String getIconClass() {
- return null;
- }
-
@Override
public String getLabel() {
return "Outgoing open requests";
@@ -244,7 +220,7 @@ public class RequestListPage extends DepotPage {
add(new MenuLink("sortBy") {
@Override
- protected List<MenuItem> getMenuItems() {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
for (Map.Entry<SortOption, String> entry: sortNames.entrySet()) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
index 98e1f87e0c..6be6686627 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
@@ -34,6 +34,7 @@ import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;
import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;
import com.gitplex.server.web.component.avatar.Avatar;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
@@ -89,12 +90,12 @@ public class DepotCollaboratorListPage extends DepotSettingPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, false, filterPrivilege) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(collaboratorsContainer);
@@ -287,12 +288,12 @@ public class DepotCollaboratorListPage extends DepotSettingPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
UserAuthorization authorization = item.getModelObject();
authorization.setPrivilege(privilege);
GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
index 6321c19311..bc4c60caea 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
@@ -27,6 +27,7 @@ import com.gitplex.server.security.privilege.DepotPrivilege;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.avatar.Avatar;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
@@ -101,12 +102,12 @@ public class DepotEffectivePrivilegePage extends DepotSettingPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, true, filterPrivilege) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(usersContainer);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
index bfffb4f36f..18bb348022 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
@@ -31,10 +31,12 @@ import com.gitplex.server.model.TeamAuthorization;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.security.privilege.DepotPrivilege;
import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
import com.gitplex.server.web.component.select2.Response;
import com.gitplex.server.web.component.select2.ResponseFiller;
@@ -89,12 +91,12 @@ public class DepotTeamListPage extends DepotSettingPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, false, filterPrivilege) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(teamsContainer);
@@ -266,12 +268,12 @@ public class DepotTeamListPage extends DepotSettingPage {
greaterPrivileges.add(new ModalLink("detail") {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
return new GreaterPrivilegesPanel(id, item.getModel()) {
@Override
protected void onClose(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
};
@@ -296,12 +298,12 @@ public class DepotTeamListPage extends DepotSettingPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- closeDropdown();
+ dropdown.close();
TeamAuthorization authorization = item.getModelObject();
authorization.setPrivilege(privilege);
GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
index b65b99b16e..a063a8d1ba 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
@@ -39,12 +39,12 @@ abstract class GateKeeperLink extends DropdownLink {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new GateKeeperSelector(id) {
@Override
protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
- closeDropdown();
+ dropdown.close();
GateKeeperLink.this.onSelect(target, gateKeeperClass);
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
index 42fa461254..694b105e7f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
@@ -79,17 +79,17 @@ abstract class GateKeeperPanel extends Panel {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
return new GateKeeperEditor(id, gateKeeper) {
@Override
protected void onCancel(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
@Override
protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- closeModal();
+ modal.close();
GateKeeperPanel.this.onChange(target, gateKeeper);
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
index da33eaf622..3015537860 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
@@ -46,6 +46,7 @@ import com.gitplex.server.web.component.link.AccountLink;
import com.gitplex.server.web.component.link.ArchiveMenuLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.revisionpicker.RevisionPicker;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
@@ -121,7 +122,7 @@ public class DepotTagsPage extends DepotPage {
}
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, ModalPanel modal) {
Fragment fragment = new Fragment(id, "createTagFrag", DepotTagsPage.this);
Form<?> form = new Form<Void>("form");
form.setOutputMarkupId(true);
@@ -186,7 +187,7 @@ public class DepotTagsPage extends DepotPage {
target.add(form);
} else {
getDepot().tag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);
- closeModal();
+ modal.close();
target.add(tagsContainer);
target.add(pagingNavigator);
target.add(noTagsContainer);
@@ -200,7 +201,7 @@ public class DepotTagsPage extends DepotPage {
@Override
public void onClick(AjaxRequestTarget target) {
- closeModal();
+ modal.close();
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
index 8eb32e13a8..dcbdea9a2c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
@@ -32,6 +32,7 @@ import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.floating.AlignPlacement;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
@@ -75,7 +76,7 @@ public abstract class LayoutPage extends BasePage {
head.add(new DropdownLink("createNewDropdown") {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
Fragment fragment = new Fragment(id, "createNewFrag", LayoutPage.this);
fragment.add(new ViewStateAwarePageLink<Void>("createNewDepot", CreateDepotPage.class));
fragment.add(new ViewStateAwarePageLink<Void>("createNewOrganization",
@@ -141,7 +142,7 @@ public abstract class LayoutPage extends BasePage {
head.add(new DropdownLink("userMenuTrigger", new AlignPlacement(50, 100, 50, 0, 8)) {
@Override
- protected Component newContent(String id) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
Fragment fragment = new Fragment(id, "userMenuFrag", LayoutPage.this);
List<Account> organizations = SecurityUtils.getAccount().getOrganizations()
.stream()