Skip to content

The Unified and Autonomous Development Platform

Improve no commits panel

Robin Shen2e368f2ab2e8
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
index 1cc8f126e9..6d062b3a8c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
@@ -23,7 +23,7 @@ import io.onedev.server.web.component.dropzonefield.DropzoneField;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
@SuppressWarnings("serial")
-abstract class BlobUploadPanel extends Panel {
+public abstract class BlobUploadPanel extends Panel {
private final BlobRenderContext context;
@@ -104,8 +104,8 @@ abstract class BlobUploadPanel extends Panel {
});
}
- abstract void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated);
+ public abstract void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated);
- abstract void onCancel(AjaxRequestTarget target);
+ public abstract void onCancel(AjaxRequestTarget target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 0e93c1fbac..fa0ab6b67f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -413,12 +413,12 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
return new BlobUploadPanel(id, ProjectBlobPage.this) {
@Override
- void onCancel(AjaxRequestTarget target) {
+ public void onCancel(AjaxRequestTarget target) {
modal.close();
}
@Override
- void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated) {
+ public void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated) {
ProjectBlobPage.this.onCommitted(target, refUpdated, null);
modal.close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
index db27895508..0eb66bbc68 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
@@ -1,13 +1,17 @@
<wicket:panel>
<div class="no-commits alert alert-warning">
- <div class="head">Project does not have any commits yet</div>
- <div class="body">
- <div>You may initialize code of the project by adding files from right top of the page, or push an existing repository from command prompt:</div>
- <div class="instructions">
+ <div class="title">Project does not have any commits yet</div>
+ <div class="content">You may initialize code of the project by <a wicket:id="addFiles">adding files</a>,
+ or <a wicket:id="pushInstructions">pushing an existing repository</a></div>
+ </div>
+ <wicket:fragment wicket:id="pushInstructionsFrag">
+ <div class="push-instructions">
+ <div class="title">Run below commands from within your git repository:</div>
+ <div class="content">
<div>git remote add origin <span wicket:id="url1"></span></div>
<div>git push -u origin master</div>
</div>
<div class="help-block"><i class="fa fa-info-circle"></i> In case remote <em>origin</em> already exists, use another name other than <em>origin</em>, or run command <em>git remote set-url origin <span wicket:id="url2"></span></em> instead</div>
</div>
- </div>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
index d861fdf145..205ca2dfbe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
@@ -1,11 +1,30 @@
package io.onedev.server.web.page.project.blob.render.renderers.nocommits;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.page.project.blob.BlobUploadPanel;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
@SuppressWarnings("serial")
public class NoCommitsPanel extends Panel {
@@ -20,9 +39,101 @@ public class NoCommitsPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("url1", context.getProject().getUrl()));
- add(new Label("url2", context.getProject().getUrl()));
+ if (SecurityUtils.canWriteCode(context.getProject().getFacade())) {
+ add(new MenuLink("addFiles") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Create New File";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ViewStateAwareAjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ context.onModeChange(target, Mode.ADD, null);
+ dropdown.close();
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Upload Files";
+ }
+
+ @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 new BlobUploadPanel(id, context) {
+
+ @Override
+ public void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ public void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated) {
+ context.onCommitted(target, refUpdated, null);
+ modal.close();
+ }
+
+ };
+ }
+
+ };
+ }
+
+ });
+ return menuItems;
+ }
+
+ });
+ } else {
+ add(new WebMarkupContainer("addFiles") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
+ }
+
+ add(new DropdownLink("pushInstructions") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ Fragment fragment = new Fragment(id, "pushInstructionsFrag", NoCommitsPanel.this);
+ fragment.add(new Label("url1", context.getProject().getUrl()));
+ fragment.add(new Label("url2", context.getProject().getUrl()));
+ return fragment;
+ }
+
+ });
setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
index e4144ab2ad..a4d433891a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
@@ -1,18 +1,24 @@
.no-commits {
margin: 20px;
}
-.no-commits>.head {
+.no-commits>.title {
font-size: 18px;
font-weight: bold;
margin-bottom: 20px;
}
-.no-commits>.body>* {
- margin-bottom: 20px;
+.push-instructions {
+ padding: 20px;
+ width: 600px;
+}
+.push-instructions .title {
+ font-weight: bold;
+ margin-bottom: 12px;
}
-.no-commits>.body>.instructions {
+.push-instructions .content {
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
- font-size: 14px;
+ font-size: 13px;
+ margin-bottom: 8px;
}
-.no-commits>.body>.help-block {
- color: inherit;
+.push-instructions .help-block {
+ margin-bottom: 0;
}
\ No newline at end of file