Skip to content

The Unified and Autonomous Development Platform

Add some help to job definition

Steve9d2d5c66de2f
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index 26b3af1407..d05a696a14 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -143,9 +143,9 @@ public class Job implements Serializable, Validatable {
return suggestions;
}
- @Editable(order=120, description="Specify commands to execute in above image, with one command per line. "
- + "For Windows based images, commands will be interpretated by cmd.exe, and for Unix/Linux "
- + "based images, commands will be interpretated by shell. "
+ @Editable(order=120, name="Commands", description="Specify content of Linux shell script or Windows command batch to execute in above image. "
+ + "It will be executed under job workspace, which may contain files of your repository and other "
+ + "dependencies based on your configuration below. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@Interpolative
@Code(language = Code.SHELL, variableProvider="getVariables")
@@ -190,7 +190,8 @@ public class Job implements Serializable, Validatable {
this.triggers = triggers;
}
- @Editable(order=9000, group="Source Retrieval")
+ @Editable(order=9000, group="Source Retrieval", description="Whether or not to retrieve files under the repository "
+ + "into job workspace")
public boolean isRetrieveSource() {
return retrieveSource;
}
@@ -260,7 +261,7 @@ public class Job implements Serializable, Validatable {
}
@Editable(order=9115, group="Artifacts & Reports", description="Optionally specify files to publish as job artifacts. "
- + "Artifact files are relative to OneDev workspace, and may use * or ? for pattern match. "
+ + "Artifact files are relative to job workspace, and may use * or ? for pattern match. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@Interpolative(variableSuggester="suggestVariables")
@Patterns(interpolative = true)
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
index 473766b30d..1e220b023e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
@@ -20,6 +20,6 @@
<a wicket:id="addFile" class="add"><i class="fa fa-plus-square-o"></i></a>
</wicket:fragment>
<wicket:fragment wicket:id="treeNodeFrag">
- <i wicket:id="icon"></i> <a wicket:id="link"><span wicket:id="label"></span></a>
+ <a wicket:id="link"><i wicket:id="icon"></i> <span wicket:id="label"></span></a>
</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/navigator/BlobNavigator.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
index dd8aa86222..1c65317767 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -198,8 +198,6 @@ public class BlobNavigator extends Panel {
BlobIdent blobIdent = model.getObject();
Fragment fragment = new Fragment(id, "treeNodeFrag", BlobNavigator.this);
- fragment.add(new BlobIcon("icon", model));
-
AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
@Override
@@ -224,6 +222,9 @@ public class BlobNavigator extends Panel {
}
};
+
+ link.add(new BlobIcon("icon", model));
+
if (blobIdent.path.indexOf('/') != -1)
link.add(new Label("label", StringUtils.substringAfterLast(blobIdent.path, "/")));
else
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
index 4aac382de5..07c695e7b2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
@@ -8,8 +8,7 @@
</tr>
<tr wicket:id="children" class="child">
<td class="path">
- <i wicket:id="pathIcon"></i>
- <a wicket:id="pathLink"><span wicket:id="label"></span></a>
+ <a wicket:id="pathLink"><i wicket:id="icon"></i> <span wicket:id="label"></span></a>
</td>
<td wicket:id="lastCommit" class="last-commit author expanded"></td>
<td class="last-commit message"></td>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
index 0bf98a1be6..8eebf8dff3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
@@ -179,23 +179,7 @@ public class FolderViewPanel extends Panel {
@Override
protected void populateItem(ListItem<BlobIdent> item) {
- final BlobIdent blobIdent = item.getModelObject();
-
- WebMarkupContainer pathIcon = new WebMarkupContainer("pathIcon");
- String iconClass;
- if (blobIdent.isTree())
- iconClass = "fa fa-folder-o";
- else if (blobIdent.isGitLink())
- iconClass = "fa fa-ext fa-folder-submodule-o";
- else if (blobIdent.isSymbolLink())
- iconClass = "fa fa-ext fa-folder-symbol-link-o";
- else if (blobIdent.path.equals(BuildSpec.BLOB_PATH))
- iconClass = "fa fa-cog";
- else
- iconClass = "fa fa-file-text-o";
- pathIcon.add(AttributeModifier.append("class", iconClass));
-
- item.add(pathIcon);
+ BlobIdent blobIdent = item.getModelObject();
AjaxLink<Void> pathLink = new ViewStateAwareAjaxLink<Void>("pathLink") {
@@ -214,6 +198,22 @@ public class FolderViewPanel extends Panel {
}
};
+
+ WebMarkupContainer icon = new WebMarkupContainer("icon");
+ String iconClass;
+ if (blobIdent.isTree())
+ iconClass = "fa fa-folder-o";
+ else if (blobIdent.isGitLink())
+ iconClass = "fa fa-ext fa-folder-submodule-o";
+ else if (blobIdent.isSymbolLink())
+ iconClass = "fa fa-ext fa-folder-symbol-link-o";
+ else if (blobIdent.path.equals(BuildSpec.BLOB_PATH))
+ iconClass = "fa fa-cog";
+ else
+ iconClass = "fa fa-file-text-o";
+ icon.add(AttributeModifier.append("class", iconClass));
+
+ pathLink.add(icon);
if (context.getBlobIdent().path != null)
pathLink.add(new Label("label", blobIdent.path.substring(context.getBlobIdent().path.length()+1)));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/build-artifacts.css b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/build-artifacts.css
index 3b94ecf1cc..0a79f4f3a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/build-artifacts.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/build-artifacts.css
@@ -21,15 +21,19 @@
padding-left: 0px;
}
-.build-artifacts .tree-content>a:before {
+.build-artifacts>table td span.tree-content>a {
+ color: #1f3b7b;
+}
+
+.build-artifacts>table td span.tree-content>a:before {
margin-right: 4px;
width: 1.28571429em;
text-align: center;
font-family: "FontAwesome";
}
-.build-artifacts .tree-content>a.folder:before {
+.build-artifacts>table td span.tree-content>a.folder:before {
content: "\f114";
}
-.build-artifacts .tree-content>a.file:before {
+.build-artifacts>table td span.tree-content>a.file:before {
content: "\f0f6";
}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
index dd2bf2a96b..5fe9168905 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
@@ -44,7 +44,7 @@ public class JobHtmlReport extends JobReport {
this.reportName = reportName;
}
- @Editable(order=1100, description="Specify start page of the report relative to workspace, for instance: api/index.html. "
+ @Editable(order=1100, description="Specify start page of the report relative to job workspace, for instance: api/index.html. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@Interpolative(variableSuggester="suggestVariables")
@NotEmpty