Skip to content

The Unified and Autonomous Development Platform

Add submitter condition to branch and tag protection rule

Robin Shen28a3977def5d
diff --git a/core/src/main/java/com/turbodev/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/turbodev/server/git/GitPreReceiveCallback.java
index b24fc76ebc..f282b34368 100644
--- a/core/src/main/java/com/turbodev/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/com/turbodev/server/git/GitPreReceiveCallback.java
@@ -156,32 +156,32 @@ public class GitPreReceiveCallback extends HttpServlet {
}
} else if (refName.startsWith(Constants.R_HEADS)) {
String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(refName));
-
- if (!oldObjectId.equals(ObjectId.zeroId())) {
- if (newObjectId.equals(ObjectId.zeroId())) {
- BranchProtection protection = project.getBranchProtection(branchName);
- if (protection != null && protection.isNoDeletion())
- error(output, refName, "Can not delete this branch according to branch protection setting");
- } else if (!GitUtils.isMergedInto(project.getRepository(), gitEnvs, oldObjectId, newObjectId)) {
- BranchProtection protection = project.getBranchProtection(branchName);
- if (protection != null && protection.isNoForcedPush())
- error(output, refName, "Can not force-push to this branch according to branch protection setting");
- } else {
- if (projectManager.isPushNeedsQualityCheck(user, project, branchName, oldObjectId, newObjectId, gitEnvs)) {
- error(output, refName,
- "Your changes need to be reviewed/verified. Please submit pull request instead");
- }
- }
+ String errorMessage = null;
+ BranchProtection protection = project.getBranchProtection(branchName, user);
+ if (protection != null) {
+ if (oldObjectId.equals(ObjectId.zeroId())) {
+ if (protection.isNoCreation())
+ errorMessage = "Can not create this branch according to branch protection setting";
+ } else if (newObjectId.equals(ObjectId.zeroId())) {
+ if (protection.isNoDeletion())
+ errorMessage = "Can not delete this branch according to branch protection setting";
+ } else if (!GitUtils.isMergedInto(project.getRepository(), gitEnvs, oldObjectId, newObjectId)) {
+ errorMessage = "Can not force-push to this branch according to branch protection setting";
+ } else if (projectManager.isPushNeedsQualityCheck(user, project, branchName, oldObjectId, newObjectId, gitEnvs)) {
+ error(output, refName,
+ "Your changes need to be reviewed/verified. Please submit pull request instead");
+ }
}
+ if (errorMessage != null)
+ error(output, refName, errorMessage);
} else if (refName.startsWith(Constants.R_TAGS)) {
String tagName = Preconditions.checkNotNull(GitUtils.ref2tag(refName));
String errorMessage = null;
- TagProtection protection = project.getTagProtection(tagName);
+ TagProtection protection = project.getTagProtection(tagName, user);
if (protection != null) {
if (oldObjectId.equals(ObjectId.zeroId())) {
- errorMessage = protection.getTagCreator().getNotMatchMessage(project, user);
- if (errorMessage != null)
- errorMessage = "Unable to create protected tag: " + errorMessage;
+ if (protection.isNoCreation())
+ errorMessage = "Can not create this tag according to tag protection setting";
} else if (newObjectId.equals(ObjectId.zeroId())) {
if (protection.isNoDeletion())
errorMessage = "Can not delete this tag according to tag protection setting";
diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupManager.java
index 4f8932fda8..2e4bb1ec56 100644
--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupManager.java
+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupManager.java
@@ -1,5 +1,7 @@
package com.turbodev.server.manager.impl;
+import java.util.Iterator;
+
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -59,10 +61,14 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements
@Override
public void delete(Group group) {
for (Project project: projectManager.findAll()) {
- for (BranchProtection protection: project.getBranchProtections())
- protection.onGroupDelete(group.getName());
- for (TagProtection protection: project.getTagProtections())
- protection.onGroupDelete(group.getName());
+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
+ if (it.next().onGroupDelete(group.getName()))
+ it.remove();
+ }
+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
+ if (it.next().onGroupDelete(group.getName()))
+ it.remove();
+ }
}
Authenticator authenticator = configManager.getAuthenticator();
if (authenticator != null) {
diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java
index 95c01f6d51..9e124837ad 100644
--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java
@@ -339,7 +339,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Override
public boolean isModificationNeedsQualityCheck(User user, Project project, String branch, @Nullable String file) {
- BranchProtection branchProtection = project.getBranchProtection(branch);
+ BranchProtection branchProtection = project.getBranchProtection(branch, user);
if (branchProtection != null) {
if (branchProtection.getReviewRequirement() != null
&& !branchProtection.getReviewRequirement().matches(user)) {
@@ -360,7 +360,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Override
public boolean isPushNeedsQualityCheck(User user, Project project, String branch, ObjectId oldObjectId,
ObjectId newObjectId, Map<String, String> gitEnvs) {
- BranchProtection branchProtection = project.getBranchProtection(branch);
+ BranchProtection branchProtection = project.getBranchProtection(branch, user);
if (branchProtection != null) {
if (branchProtection.getReviewRequirement() != null
&& !branchProtection.getReviewRequirement().matches(user)) {
diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserManager.java
index 8b850781d1..cbaf2951f8 100644
--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserManager.java
+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserManager.java
@@ -1,5 +1,7 @@
package com.turbodev.server.manager.impl;
+import java.util.Iterator;
+
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -128,10 +130,14 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
dao.remove(user);
for (Project project: dao.findAll(Project.class)) {
- for (BranchProtection protection: project.getBranchProtections())
- protection.onUserDelete(user.getName());
- for (TagProtection protection: project.getTagProtections())
- protection.onUserDelete(user.getName());
+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
+ if (it.next().onUserDelete(user.getName()))
+ it.remove();
+ }
+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
+ if (it.next().onUserDelete(user.getName()))
+ it.remove();
+ }
}
}
diff --git a/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java b/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java
index 379036a252..b1597279b0 100644
--- a/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java
+++ b/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java
@@ -435,4 +435,23 @@ public class DatabaseMigrator {
}
}
+ private void migrate14(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Projects.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element projectElement: dom.getRootElement().elements()) {
+ for (Element branchProtectionElement: projectElement.element("branchProtections").elements()) {
+ Element submitterElement = branchProtectionElement.addElement("submitter");
+ submitterElement.addAttribute("class", "com.turbodev.server.model.support.submitter.Anyone");
+ branchProtectionElement.addElement("noCreation").setText("true");
+ }
+ for (Element tagProtectionElement: projectElement.element("tagProtections").elements()) {
+ tagProtectionElement.detach();
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/core/src/main/java/com/turbodev/server/model/Project.java b/core/src/main/java/com/turbodev/server/model/Project.java
index a8a8b1017c..fa76a16bfd 100644
--- a/core/src/main/java/com/turbodev/server/model/Project.java
+++ b/core/src/main/java/com/turbodev/server/model/Project.java
@@ -833,19 +833,25 @@ public class Project extends AbstractEntity {
}
@Nullable
- public TagProtection getTagProtection(String tagName) {
+ public TagProtection getTagProtection(String tagName, User user) {
for (TagProtection protection: tagProtections) {
- if (protection.isEnabled() && PathUtils.matchChildAware(protection.getTag(), tagName))
+ if (protection.isEnabled()
+ && PathUtils.matchChildAware(protection.getTag(), tagName)
+ && protection.getSubmitter().matches(this, user)) {
return protection;
+ }
}
return null;
}
@Nullable
- public BranchProtection getBranchProtection(String branchName) {
+ public BranchProtection getBranchProtection(String branchName, @Nullable User user) {
for (BranchProtection protection: branchProtections) {
- if (protection.isEnabled() && PathUtils.matchChildAware(protection.getBranch(), branchName))
+ if (protection.isEnabled()
+ && PathUtils.matchChildAware(protection.getBranch(), branchName)
+ && protection.getSubmitter().matches(this, user)) {
return protection;
+ }
}
return null;
}
diff --git a/core/src/main/java/com/turbodev/server/model/support/BranchProtection.java b/core/src/main/java/com/turbodev/server/model/support/BranchProtection.java
index 20e23fc8de..6b729dbb43 100644
--- a/core/src/main/java/com/turbodev/server/model/support/BranchProtection.java
+++ b/core/src/main/java/com/turbodev/server/model/support/BranchProtection.java
@@ -12,14 +12,18 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
-import com.turbodev.utils.PathUtils;
import com.turbodev.server.model.Group;
import com.turbodev.server.model.User;
+import com.turbodev.server.model.support.submitter.Anyone;
+import com.turbodev.server.model.support.submitter.SpecifiedGroup;
+import com.turbodev.server.model.support.submitter.SpecifiedUser;
+import com.turbodev.server.model.support.submitter.Submitter;
import com.turbodev.server.util.editable.annotation.BranchPattern;
import com.turbodev.server.util.editable.annotation.Editable;
import com.turbodev.server.util.editable.annotation.ReviewRequirementSpec;
import com.turbodev.server.util.editable.annotation.VerificationChoice;
import com.turbodev.server.util.reviewrequirement.ReviewRequirement;
+import com.turbodev.utils.PathUtils;
@Editable
public class BranchProtection implements Serializable {
@@ -30,10 +34,14 @@ public class BranchProtection implements Serializable {
private String branch;
+ private Submitter submitter = new Anyone();
+
private boolean noForcedPush = true;
private boolean noDeletion = true;
+ private boolean noCreation = true;
+
private String reviewRequirementSpec;
private List<String> verifications = new ArrayList<>();
@@ -64,6 +72,17 @@ public class BranchProtection implements Serializable {
this.branch = branch;
}
+ @Editable(order=150, name="If Submitted By", description="This protection rule will apply "
+ + "only if the change is submitted by specified users here")
+ @NotNull
+ public Submitter getSubmitter() {
+ return submitter;
+ }
+
+ public void setSubmitter(Submitter submitter) {
+ this.submitter = submitter;
+ }
+
@Editable(order=200, description="Check this to not allow forced push")
public boolean isNoForcedPush() {
return noForcedPush;
@@ -82,6 +101,15 @@ public class BranchProtection implements Serializable {
this.noDeletion = noDeletion;
}
+ @Editable(order=350, description="Check this to not allow branch creation")
+ public boolean isNoCreation() {
+ return noCreation;
+ }
+
+ public void setNoCreation(boolean noCreation) {
+ this.noCreation = noCreation;
+ }
+
@Editable(order=400, name="Required Reviewers", description="Optionally specify required reviewers for changes of "
+ "specified branch. TurboDev assumes that the user submitting the change has completed the review already")
@ReviewRequirementSpec
@@ -149,6 +177,12 @@ public class BranchProtection implements Serializable {
}
public void onGroupRename(String oldName, String newName) {
+ if (getSubmitter() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();
+ if (specifiedGroup.getGroupName().equals(oldName))
+ specifiedGroup.setGroupName(newName);
+ }
+
ReviewRequirement reviewRequirement = getReviewRequirement();
if (reviewRequirement != null) {
for (Group group: reviewRequirement.getGroups().keySet()) {
@@ -173,7 +207,13 @@ public class BranchProtection implements Serializable {
}
}
- public void onGroupDelete(String groupName) {
+ public boolean onGroupDelete(String groupName) {
+ if (getSubmitter() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();
+ if (specifiedGroup.getGroupName().equals(groupName))
+ return true;
+ }
+
ReviewRequirement reviewRequirement = getReviewRequirement();
if (reviewRequirement != null) {
for (Iterator<Map.Entry<Group, Integer>> it = reviewRequirement.getGroups().entrySet().iterator();
@@ -204,9 +244,17 @@ public class BranchProtection implements Serializable {
it.remove();
}
}
+
+ return false;
}
public void onUserRename(String oldName, String newName) {
+ if (getSubmitter() instanceof SpecifiedUser) {
+ SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();
+ if (specifiedUser.getUserName().equals(oldName))
+ specifiedUser.setUserName(newName);
+ }
+
ReviewRequirement reviewRequirement = getReviewRequirement();
if (reviewRequirement != null) {
for (User user: reviewRequirement.getUsers()) {
@@ -228,10 +276,16 @@ public class BranchProtection implements Serializable {
} else {
it.remove();
}
- }
+ }
}
- public void onUserDelete(String userName) {
+ public boolean onUserDelete(String userName) {
+ if (getSubmitter() instanceof SpecifiedUser) {
+ SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();
+ if (specifiedUser.getUserName().equals(userName))
+ return true;
+ }
+
ReviewRequirement reviewRequirement = getReviewRequirement();
if (reviewRequirement != null) {
for (Iterator<User> it = reviewRequirement.getUsers().iterator(); it.hasNext();) {
@@ -260,6 +314,7 @@ public class BranchProtection implements Serializable {
it.remove();
}
}
+ return false;
}
public boolean onBranchDelete(String branchName) {
diff --git a/core/src/main/java/com/turbodev/server/model/support/TagProtection.java b/core/src/main/java/com/turbodev/server/model/support/TagProtection.java
index e36cdae837..34fdf54b47 100644
--- a/core/src/main/java/com/turbodev/server/model/support/TagProtection.java
+++ b/core/src/main/java/com/turbodev/server/model/support/TagProtection.java
@@ -6,10 +6,10 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
-import com.turbodev.server.model.support.tagcreator.ProjectWriters;
-import com.turbodev.server.model.support.tagcreator.SpecifiedGroup;
-import com.turbodev.server.model.support.tagcreator.SpecifiedUser;
-import com.turbodev.server.model.support.tagcreator.TagCreator;
+import com.turbodev.server.model.support.submitter.Anyone;
+import com.turbodev.server.model.support.submitter.SpecifiedGroup;
+import com.turbodev.server.model.support.submitter.SpecifiedUser;
+import com.turbodev.server.model.support.submitter.Submitter;
import com.turbodev.server.util.editable.annotation.Editable;
import com.turbodev.server.util.editable.annotation.TagPattern;
@@ -22,12 +22,14 @@ public class TagProtection implements Serializable {
private String tag;
+ private Submitter submitter = new Anyone();
+
private boolean noUpdate = true;
private boolean noDeletion = true;
- private TagCreator tagCreator = new ProjectWriters();
-
+ private boolean noCreation = true;
+
public boolean isEnabled() {
return enabled;
}
@@ -47,6 +49,17 @@ public class TagProtection implements Serializable {
this.tag = tag;
}
+ @Editable(order=150, name="If Performed By", description="This protection rule will apply "
+ + "only if the action is performed by specified users here")
+ @NotNull
+ public Submitter getSubmitter() {
+ return submitter;
+ }
+
+ public void setSubmitter(Submitter submitter) {
+ this.submitter = submitter;
+ }
+
@Editable(order=200, description="Check this to not allow tag update")
public boolean isNoUpdate() {
return noUpdate;
@@ -65,46 +78,47 @@ public class TagProtection implements Serializable {
this.noDeletion = noDeletion;
}
- @Editable(order=400, name="Allowed Creator", description="Specify users allowed to create specified tag")
- @NotNull
- public TagCreator getTagCreator() {
- return tagCreator;
+ @Editable(order=400, description="Check this to not allow tag creation")
+ public boolean isNoCreation() {
+ return noCreation;
}
- public void setTagCreator(TagCreator tagCreator) {
- this.tagCreator = tagCreator;
+ public void setNoCreation(boolean noCreation) {
+ this.noCreation = noCreation;
}
-
+
public void onGroupRename(String oldName, String newName) {
- if (getTagCreator() instanceof SpecifiedGroup) {
- SpecifiedGroup specifiedGroup = (SpecifiedGroup) getTagCreator();
+ if (getSubmitter() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();
if (specifiedGroup.getGroupName().equals(oldName))
specifiedGroup.setGroupName(newName);
}
}
- public void onGroupDelete(String groupName) {
- if (getTagCreator() instanceof SpecifiedGroup) {
- SpecifiedGroup specifiedGroup = (SpecifiedGroup) getTagCreator();
+ public boolean onGroupDelete(String groupName) {
+ if (getSubmitter() instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) getSubmitter();
if (specifiedGroup.getGroupName().equals(groupName))
- setTagCreator(new ProjectWriters());
+ return true;
}
+ return false;
}
public void onUserRename(String oldName, String newName) {
- if (getTagCreator() instanceof SpecifiedUser) {
- SpecifiedUser specifiedUser = (SpecifiedUser) getTagCreator();
+ if (getSubmitter() instanceof SpecifiedUser) {
+ SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();
if (specifiedUser.getUserName().equals(oldName))
specifiedUser.setUserName(newName);
}
}
- public void onUserDelete(String userName) {
- if (getTagCreator() instanceof SpecifiedUser) {
- SpecifiedUser specifiedUser = (SpecifiedUser) getTagCreator();
+ public boolean onUserDelete(String userName) {
+ if (getSubmitter() instanceof SpecifiedUser) {
+ SpecifiedUser specifiedUser = (SpecifiedUser) getSubmitter();
if (specifiedUser.getUserName().equals(userName))
- setTagCreator(new ProjectWriters());
+ return true;
}
+ return false;
}
public boolean onTagDelete(String tagName) {
diff --git a/core/src/main/java/com/turbodev/server/model/support/submitter/Anyone.java b/core/src/main/java/com/turbodev/server/model/support/submitter/Anyone.java
new file mode 100644
index 0000000000..c81a95ad08
--- /dev/null
+++ b/core/src/main/java/com/turbodev/server/model/support/submitter/Anyone.java
@@ -0,0 +1,17 @@
+package com.turbodev.server.model.support.submitter;
+
+import com.turbodev.server.model.Project;
+import com.turbodev.server.model.User;
+import com.turbodev.server.util.editable.annotation.Editable;
+
+@Editable(order=100, name="Anyone")
+public class Anyone implements Submitter {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean matches(Project project, User user) {
+ return true;
+ }
+
+}
diff --git a/core/src/main/java/com/turbodev/server/model/support/submitter/ProjectAdministrators.java b/core/src/main/java/com/turbodev/server/model/support/submitter/ProjectAdministrators.java
new file mode 100644
index 0000000000..9c61ac1ad6
--- /dev/null
+++ b/core/src/main/java/com/turbodev/server/model/support/submitter/ProjectAdministrators.java
@@ -0,0 +1,19 @@
+package com.turbodev.server.model.support.submitter;
+
+import com.turbodev.server.model.Project;
+import com.turbodev.server.model.User;
+import com.turbodev.server.security.ProjectPrivilege;
+import com.turbodev.server.security.permission.ProjectPermission;
+import com.turbodev.server.util.editable.annotation.Editable;
+
+@Editable(order=400, name="Project administrators")
+public class ProjectAdministrators implements Submitter {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean matches(Project project, User user) {
+ return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN));
+ }
+
+}
diff --git a/core/src/main/java/com/turbodev/server/model/support/tagcreator/SpecifiedGroup.java b/core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedGroup.java
similarity index 70%
rename from core/src/main/java/com/turbodev/server/model/support/tagcreator/SpecifiedGroup.java
rename to core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedGroup.java
index 11df720504..fea3ecba5f 100644
--- a/core/src/main/java/com/turbodev/server/model/support/tagcreator/SpecifiedGroup.java
+++ b/core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedGroup.java
@@ -1,4 +1,4 @@
-package com.turbodev.server.model.support.tagcreator;
+package com.turbodev.server.model.support.submitter;
import org.hibernate.validator.constraints.NotEmpty;
@@ -11,8 +11,8 @@ import com.turbodev.server.model.User;
import com.turbodev.server.util.editable.annotation.Editable;
import com.turbodev.server.util.editable.annotation.GroupChoice;
-@Editable(order=300, name="Specified Group")
-public class SpecifiedGroup implements TagCreator {
+@Editable(order=300, name="Specified group")
+public class SpecifiedGroup implements Submitter {
private static final long serialVersionUID = 1L;
@@ -30,13 +30,10 @@ public class SpecifiedGroup implements TagCreator {
}
@Override
- public String getNotMatchMessage(Project project, User user) {
+ public boolean matches(Project project, User user) {
GroupManager groupManager = TurboDev.getInstance(GroupManager.class);
Group group = Preconditions.checkNotNull(groupManager.find(groupName));
- if (!group.getMembers().contains(user))
- return "This operation can only be performed by group: " + groupName;
- else
- return null;
+ return group.getMembers().contains(user);
}
}
diff --git a/core/src/main/java/com/turbodev/server/model/support/tagcreator/SpecifiedUser.java b/core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedUser.java
similarity index 67%
rename from core/src/main/java/com/turbodev/server/model/support/tagcreator/SpecifiedUser.java
rename to core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedUser.java
index 39a2ee873b..33f5f548e8 100644
--- a/core/src/main/java/com/turbodev/server/model/support/tagcreator/SpecifiedUser.java
+++ b/core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedUser.java
@@ -1,4 +1,4 @@
-package com.turbodev.server.model.support.tagcreator;
+package com.turbodev.server.model.support.submitter;
import org.hibernate.validator.constraints.NotEmpty;
@@ -10,15 +10,15 @@ import com.turbodev.server.model.User;
import com.turbodev.server.util.editable.annotation.Editable;
import com.turbodev.server.util.editable.annotation.UserChoice;
-@Editable(order=400, name="Specified User")
-public class SpecifiedUser implements TagCreator {
+@Editable(order=200, name="Specified user")
+public class SpecifiedUser implements Submitter {
private static final long serialVersionUID = 1L;
-
+
private String userName;
@Editable(name="User")
- @UserChoice(type=UserChoice.Type.PROJECT_WRITER)
+ @UserChoice
@NotEmpty
public String getUserName() {
return userName;
@@ -29,13 +29,10 @@ public class SpecifiedUser implements TagCreator {
}
@Override
- public String getNotMatchMessage(Project project, User user) {
+ public boolean matches(Project project, User user) {
UserManager userManager = TurboDev.getInstance(UserManager.class);
User specifiedUser = Preconditions.checkNotNull(userManager.findByName(userName));
- if (!specifiedUser.equals(user))
- return "This operation can only be performed by user: " + userName;
- else
- return null;
+ return specifiedUser.equals(user);
}
}
diff --git a/core/src/main/java/com/turbodev/server/model/support/tagcreator/TagCreator.java b/core/src/main/java/com/turbodev/server/model/support/submitter/Submitter.java
similarity index 56%
rename from core/src/main/java/com/turbodev/server/model/support/tagcreator/TagCreator.java
rename to core/src/main/java/com/turbodev/server/model/support/submitter/Submitter.java
index 3b9e67c684..1eca849bf9 100644
--- a/core/src/main/java/com/turbodev/server/model/support/tagcreator/TagCreator.java
+++ b/core/src/main/java/com/turbodev/server/model/support/submitter/Submitter.java
@@ -1,4 +1,4 @@
-package com.turbodev.server.model.support.tagcreator;
+package com.turbodev.server.model.support.submitter;
import java.io.Serializable;
@@ -9,9 +9,8 @@ import com.turbodev.server.model.User;
import com.turbodev.server.util.editable.annotation.Editable;
@Editable
-public interface TagCreator extends Serializable {
+public interface Submitter extends Serializable {
- @Nullable
- String getNotMatchMessage(Project project, User user);
+ boolean matches(Project project, @Nullable User user);
}
diff --git a/core/src/main/java/com/turbodev/server/model/support/tagcreator/ProjectAdministrators.java b/core/src/main/java/com/turbodev/server/model/support/tagcreator/ProjectAdministrators.java
deleted file mode 100644
index 0739e1a19e..0000000000
--- a/core/src/main/java/com/turbodev/server/model/support/tagcreator/ProjectAdministrators.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.turbodev.server.model.support.tagcreator;
-
-import com.turbodev.server.model.Project;
-import com.turbodev.server.model.User;
-import com.turbodev.server.security.ProjectPrivilege;
-import com.turbodev.server.security.permission.ProjectPermission;
-import com.turbodev.server.util.editable.annotation.Editable;
-
-@Editable(order=200, name="Project Administrators")
-public class ProjectAdministrators implements TagCreator {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getNotMatchMessage(Project project, User user) {
- if (!user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN))) {
- return "This operation can only be performed by project administrators";
- } else {
- return null;
- }
- }
-
-}
diff --git a/core/src/main/java/com/turbodev/server/model/support/tagcreator/ProjectWriters.java b/core/src/main/java/com/turbodev/server/model/support/tagcreator/ProjectWriters.java
deleted file mode 100644
index c689c5b143..0000000000
--- a/core/src/main/java/com/turbodev/server/model/support/tagcreator/ProjectWriters.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.turbodev.server.model.support.tagcreator;
-
-import com.turbodev.server.model.Project;
-import com.turbodev.server.model.User;
-import com.turbodev.server.security.ProjectPrivilege;
-import com.turbodev.server.security.permission.ProjectPermission;
-import com.turbodev.server.util.editable.annotation.Editable;
-
-@Editable(order=100, name="All Users Able to Write the Project")
-public class ProjectWriters implements TagCreator {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getNotMatchMessage(Project project, User user) {
- if (!user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.WRITE))) {
- return "This operation can only be performed by project writers";
- } else {
- return null;
- }
- }
-
-}
diff --git a/core/src/main/java/com/turbodev/server/security/SecurityUtils.java b/core/src/main/java/com/turbodev/server/security/SecurityUtils.java
index 1df3a32244..5c275a9e52 100644
--- a/core/src/main/java/com/turbodev/server/security/SecurityUtils.java
+++ b/core/src/main/java/com/turbodev/server/security/SecurityUtils.java
@@ -131,7 +131,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canDeleteBranch(Project project, String branchName) {
if (canWrite(project)) {
- BranchProtection protection = project.getBranchProtection(branchName);
+ BranchProtection protection = project.getBranchProtection(branchName, getUser());
return protection == null || !protection.isNoDeletion();
} else {
return false;
@@ -141,9 +141,18 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
@Nullable
public static boolean canCreateTag(Project project, String tagName) {
if (canWrite(project)) {
- TagProtection protection = project.getTagProtection(tagName);
- return protection == null ||
- protection.getTagCreator().getNotMatchMessage(project, SecurityUtils.getUser()) == null;
+ TagProtection protection = project.getTagProtection(tagName, getUser());
+ return protection == null || !protection.isNoCreation();
+ } else {
+ return false;
+ }
+ }
+
+ @Nullable
+ public static boolean canCreateBranch(Project project, String branchName) {
+ if (canWrite(project)) {
+ BranchProtection protection = project.getBranchProtection(branchName, getUser());
+ return protection == null || !protection.isNoCreation();
} else {
return false;
}
diff --git a/core/src/main/java/com/turbodev/server/util/QualityCheckStatus.java b/core/src/main/java/com/turbodev/server/util/QualityCheckStatus.java
index a85f39df5c..2923ec1f75 100644
--- a/core/src/main/java/com/turbodev/server/util/QualityCheckStatus.java
+++ b/core/src/main/java/com/turbodev/server/util/QualityCheckStatus.java
@@ -94,7 +94,7 @@ public class QualityCheckStatus {
}
}
- BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch());
+ BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());
if (branchProtection != null) {
ReviewRequirement reviewRequirement = branchProtection.getReviewRequirement();
if (reviewRequirement != null)
diff --git a/web/.tern-project b/web/.tern-project
index 15c89ad421..daa12a1091 100644
--- a/web/.tern-project
+++ b/web/.tern-project
@@ -7,5 +7,14 @@
"importExportOutsideOfTopBlock": 2,
"hashBang": 0,
"pebbleSyntax": 2
- }
+ },
+ "plugins": {
+ "guess-types": {
+
+ }
+ },
+ "libs": [
+ "ecma5",
+ "browser"
+ ]
}
\ No newline at end of file
diff --git a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java
index c1098c88ff..a8ddc24037 100644
--- a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java
+++ b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java
@@ -13,7 +13,7 @@ public class HotkeysResourceReference extends JavaScriptResourceReference {
private static final long serialVersionUID = 1L;
public HotkeysResourceReference() {
- super(HotkeysResourceReference.class, "jquery.hotkeys.js");
+ super(HotkeysResourceReference.class, "jquery.hotkeys.patched.js");
}
@Override
diff --git a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.js b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.patched.js
similarity index 95%
rename from web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.js
rename to web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.patched.js
index 936fde3e6b..f5903f751b 100644
--- a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.js
+++ b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.patched.js
@@ -144,11 +144,12 @@
handleObj.handler = function(event) {
// Don't fire in text-accepting inputs that we didn't directly bind to
+ // Patched to still fire events if key is triggered by a readonly input element
if (this !== event.target &&
(jQuery.hotkeys.options.filterInputAcceptingElements &&
- jQuery.hotkeys.textInputTypes.test(event.target.nodeName) ||
+ jQuery.hotkeys.textInputTypes.test(event.target.nodeName) && !jQuery(event.target).is('[readonly]') ||
(jQuery.hotkeys.options.filterContentEditable && jQuery(event.target).attr('contenteditable')) ||
- (jQuery.hotkeys.options.filterTextInputs &&
+ (jQuery.hotkeys.options.filterTextInputs && !jQuery(event.target).is('[readonly]') &&
jQuery.inArray(event.target.type, jQuery.hotkeys.textAcceptingInputTypes) > -1))) {
return;
}
diff --git a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchLink.java b/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchLink.java
index b3d1fac2cc..6750c8f735 100644
--- a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchLink.java
+++ b/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchLink.java
@@ -3,6 +3,7 @@ package com.turbodev.server.web.component.createbranch;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
+import org.eclipse.jgit.lib.Constants;
import com.turbodev.server.model.Project;
import com.turbodev.server.security.SecurityUtils;
@@ -25,7 +26,7 @@ public abstract class CreateBranchLink extends ModalLink {
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.canWrite(projectModel.getObject()));
+ setVisible(SecurityUtils.canCreateBranch(projectModel.getObject(), Constants.R_HEADS));
}
@Override
diff --git a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.java b/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.java
index a8da273b38..8ddea3b0cc 100644
--- a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.java
+++ b/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.java
@@ -10,8 +10,12 @@ import org.apache.wicket.model.IModel;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
+import com.google.common.base.Preconditions;
import com.turbodev.server.git.GitUtils;
import com.turbodev.server.model.Project;
+import com.turbodev.server.model.User;
+import com.turbodev.server.model.support.BranchProtection;
+import com.turbodev.server.security.SecurityUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -77,8 +81,18 @@ abstract class CreateBranchPanel extends Panel {
target.focusComponent(nameInput);
target.add(form);
} else {
- projectModel.getObject().createBranch(branchName, revision);
- onCreate(target, branchName);
+ Project project = projectModel.getObject();
+ User user = Preconditions.checkNotNull(SecurityUtils.getUser());
+
+ BranchProtection protection = project.getBranchProtection(branchName, user);
+ if (protection != null && protection.isNoCreation()) {
+ form.error("Unable to create protected branch");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else {
+ project.createBranch(branchName, revision);
+ onCreate(target, branchName);
+ }
}
}
diff --git a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.html b/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.html
index 0a1e74593a..04163aef38 100644
--- a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.html
+++ b/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.html
@@ -8,7 +8,7 @@
<div wicket:id="feedback"></div>
<wicket:enclosure child="name">
<div class="form-group">
- <label>Tag Name</label>
+ <label>Tag Name *</label>
<input wicket:id="name" class="form-control autofocus">
</div>
</wicket:enclosure>
diff --git a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.java b/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.java
index 81b6a12424..389afa6bc7 100644
--- a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.java
+++ b/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.java
@@ -113,18 +113,15 @@ public abstract class CreateTagPanel extends Panel {
Project project = projectModel.getObject();
User user = Preconditions.checkNotNull(SecurityUtils.getUser());
- String errorMessage = null;
- TagProtection protection = project.getTagProtection(tagName);
- if (protection != null)
- errorMessage = protection.getTagCreator().getNotMatchMessage(project, user);
- if (errorMessage != null) {
- form.error("Unable to create protected tag: " + errorMessage);
+ TagProtection protection = project.getTagProtection(tagName, user);
+ if (protection != null && protection.isNoCreation()) {
+ form.error("Unable to create protected tag");
target.focusComponent(nameInput);
target.add(form);
- } else {
+ } else {
project.tag(tagName, revision, user.asPerson(), tagMessage);
onCreate(target, tagName);
- }
+ }
}
}
diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css b/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css
index 4ac7dafcc9..4718159256 100644
--- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css
+++ b/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css
@@ -6,6 +6,9 @@
padding: 8px;
border-bottom: 1px solid #E0E0E0;
}
+.text-diff>.head .diff-title span {
+ word-break: break-all;
+}
.text-diff>.head .actions>a {
margin-right: 0;
}
@@ -32,13 +35,13 @@
}
.text-diff>.body>tbody>tr>td.number {
padding: 0 4px;
- border-left: 1px solid #EEE;
+ border-left: 1px solid #E0E0E0;
text-align: right;
font-size: 12px;
- color: #BBB;
+ color: #9E9E9E;
}
.text-diff>.body>tbody>tr>td.operation {
- border-left: 1px solid #EEE;
+ border-left: 1px solid #E0E0E0;
}
.text-diff>.body>tbody>tr>td:FIRST-CHILD {
border-left: none !important;
@@ -166,7 +169,7 @@
overflow: hidden;
white-space: nowrap;
padding: 0 4px;
- border-left: 1px solid #EEE;
+ border-left: 1px solid #E0E0E0;
}
.text-diff>.body>tbody>tr>td.blame.abbr {
text-overflow: inherit;
diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js b/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js
index 1524f0f6ed..81f142dc0d 100644
--- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js
+++ b/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js
@@ -66,7 +66,6 @@ turbodev.server.revisionDiff = {
$comment.css("left", $detail.offset().left - scrollLeft);
var topOffset = $diffs.offset().top - scrollTop;
var headHeight = $("#layout>.head").outerHeight();
- var footHeight = $("#layout>.foot").outerHeight();
if (topOffset <= headHeight) {
$comment.css("top", headHeight);
} else {
@@ -75,12 +74,12 @@ turbodev.server.revisionDiff = {
var $lastDiff = $diffs.children().last();
var commentHeight;
if ($lastDiff.length != 0) {
- commentHeight = $lastDiff.offset().top + $lastDiff.height() - scrollTop - headHeight - footHeight;
+ commentHeight = $lastDiff.offset().top + $lastDiff.height() - scrollTop - headHeight;
} else {
- commentHeight = $diffs.offset().top + $diffs.height() - scrollTop - headHeight - footHeight;
+ commentHeight = $diffs.offset().top + $diffs.height() - scrollTop - headHeight;
}
- var maxCommentHeight = windowHeight - headHeight - footHeight;
- var minCommentHeight = maxCommentHeight - 52;
+ var maxCommentHeight = windowHeight - headHeight;
+ var minCommentHeight = maxCommentHeight - 20;
if (commentHeight < minCommentHeight)
commentHeight = minCommentHeight;
else if (commentHeight > maxCommentHeight)
diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.java b/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.java
index 8017a73277..fcd8c9f167 100644
--- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.java
+++ b/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.java
@@ -116,7 +116,7 @@ public abstract class RevisionSelector extends Panel {
this.revision = revision;
if (canCreateRef) {
Project project = projectModel.getObject();
- canCreateBranch = SecurityUtils.canWrite(project);
+ canCreateBranch = SecurityUtils.canCreateBranch(project, Constants.R_HEADS);
canCreateTag = SecurityUtils.canCreateTag(project, Constants.R_TAGS);
} else {
canCreateBranch = false;
@@ -277,7 +277,7 @@ public abstract class RevisionSelector extends Panel {
itemValues.add(COMMIT_FLAG + revInput);
} else if (branchesActive) {
if (canCreateBranch) {
- if (SecurityUtils.canWrite(project))
+ if (SecurityUtils.canCreateBranch(project, revInput))
itemValues.add(ADD_FLAG + revInput);
}
} else {
diff --git a/web/src/main/java/com/turbodev/server/web/editable/NotDefinedLabel.java b/web/src/main/java/com/turbodev/server/web/editable/NotDefinedLabel.java
index d725278902..25a5e585cd 100644
--- a/web/src/main/java/com/turbodev/server/web/editable/NotDefinedLabel.java
+++ b/web/src/main/java/com/turbodev/server/web/editable/NotDefinedLabel.java
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label;
public class NotDefinedLabel extends Label {
public NotDefinedLabel(String id) {
- super(id, "<i>Not Defined</i>");
+ super(id, "<i>Not defined</i>");
setEscapeModelStrings(false);
}
diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html b/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html
index 8550633104..97e2c18807 100644
--- a/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html
+++ b/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html
@@ -14,7 +14,7 @@
</tr>
<wicket:enclosure>
<tr class="no-elements">
- <td wicket:id="noElements">No Elements Defined</td>
+ <td wicket:id="noElements">No elements defined</td>
</tr>
</wicket:enclosure>
</tbody>
diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html b/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html
index 403541e93a..e6f4afc073 100644
--- a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html
+++ b/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html
@@ -7,7 +7,7 @@
<!-- Put no-elements row here as Firefox has some issues displaying top border
of no-elements if tbody is empty -->
<tr wicket:id="noElements" class="no-elements">
- <td>No Elements Defined</td>
+ <td>No elements defined</td>
</tr>
<tr wicket:id="elements"></tr>
</tbody>
diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html b/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html
index 4b80af7fda..c005749aa3 100644
--- a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html
+++ b/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html
@@ -7,7 +7,7 @@
</tbody>
<tfoot>
<tr wicket:id="noElements">
- <td class="no-elements">No Elements Defined</td>
+ <td class="no-elements">No elements defined</td>
</tr>
</tfoot>
</table>
diff --git a/web/src/main/java/com/turbodev/server/web/page/base/base.css b/web/src/main/java/com/turbodev/server/web/page/base/base.css
index 9365cb4453..fccc94f315 100644
--- a/web/src/main/java/com/turbodev/server/web/page/base/base.css
+++ b/web/src/main/java/com/turbodev/server/web/page/base/base.css
@@ -1,5 +1,4 @@
body {
- min-width: 768px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
background: white;
}
@@ -335,15 +334,30 @@ form>.test-feedback {
.center-box {
padding: 50px;
- width: 600px;
+ max-width: 600px;
min-width: 300px;
- margin: 0 auto;
background: #FAFAFA;
border: 8px solid #E0E0E0;
- margin-top: 100px;
- margin-bottom: 20px;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 50px;
+ margin-bottom: 50px;
color: #333;
}
+.wide.center-box {
+ max-width: 900px;
+ min-width: 900px;
+}
+
+.center-box h1 {
+ font-size: 32px;
+ margin: 0 0 30px;
+ font-weight: 300;
+}
+.center-box h1 .fa {
+ font-size: 32px;
+}
+
a {
cursor: pointer;
diff --git a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html b/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html
index 4255f956a4..d6553ffe6d 100644
--- a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div wicket:id="error" class="center-box">
+ <div wicket:id="error" class="wide center-box">
<div wicket:id="title" class="title"></div>
<div wicket:id="description" class="description"></div>
<div class="actions">
diff --git a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html b/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html
index 6c3994aa37..3d97cf9289 100644
--- a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html
@@ -41,7 +41,7 @@
return noError;
};
</script>
- <div class="center-box">
+ <div class="wide center-box">
<div class="title">Whoops! An Unexpected Exception Occurred</div>
<div class="description">Sorry, we've encountered an unexpected
diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java
index f451ce2365..9b85df0981 100644
--- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java
@@ -74,12 +74,6 @@ public abstract class LayoutPage extends BasePage {
head.add(new MenuLink("nav") {
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.isAdministrator());
- }
-
@Override
protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> items = new ArrayList<>();
diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/layout.css b/web/src/main/java/com/turbodev/server/web/page/layout/layout.css
index 9bbc08511c..3f11082812 100644
--- a/web/src/main/java/com/turbodev/server/web/page/layout/layout.css
+++ b/web/src/main/java/com/turbodev/server/web/page/layout/layout.css
@@ -1,3 +1,6 @@
+#layout {
+ min-width: 768px;
+}
#layout>.head {
background: #212121;
padding: 8px 16px;
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css
index b389b76b4d..56780fe9c4 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css
@@ -1,5 +1,6 @@
#project-blob {
margin: -20px;
+ background: white;
}
#project-blob>.head {
border-bottom: 1px solid #E0E0E0;
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js
index 7b2783cad0..b4e7862ecf 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js
@@ -55,7 +55,7 @@ turbodev.server.projectBlob = {
var $blobContent = $("#project-blob>.blob-content");
- var minWindowWidth = turbodev.server.projectBlob.parseCssDimension($("body").css("min-width"));
+ var minWindowWidth = turbodev.server.projectBlob.parseCssDimension($("#layout").css("min-width"));
var windowWidth = $(window).width();
if (windowWidth < minWindowWidth) {
@@ -68,9 +68,6 @@ turbodev.server.projectBlob = {
var height = $(window).height()-$blobContent.offset().top;
- if ($("#layout>.foot").length != 0)
- height -= $("#layout>.foot").outerHeight();
-
var $searchResult = $("#project-blob>.search-result");
if ($searchResult.is(":visible")) {
var $searchResultHead = $searchResult.find(".search-result>.head");
@@ -90,16 +87,16 @@ turbodev.server.projectBlob = {
$blobContent.find(".autofit:visible").first().triggerHandler(
"autofit", [$blobContent.width(), $blobContent.height()]);
});
-
- $(document).on("keydown", function(e) {
- if (e.key == "t") {
- if ($(".modal:visible").length == 0)
- callback("quickSearch");
- } else if (e.key == "v") {
- if ($(".modal:visible").length == 0)
- callback("advancedSearch");
- }
+
+ $(document).bind("keydown", "t", function(e) {
+ if ($(".modal:visible").length == 0)
+ callback("quickSearch");
+ });
+ $(document).bind("keydown", "v", function(e) {
+ if ($(".modal:visible").length == 0)
+ callback("advancedSearch");
});
+
},
parseCssDimension: function(cssDimension) {
var index = cssDimension.indexOf("px");
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css
index 8584381e4c..b6830a9d42 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css
@@ -1,30 +1,32 @@
.blob-edit>.head {
- border-bottom: 1px solid #BBB;
+ border-bottom: 1px solid #BDBDBD;
height: 36px;
- background: #F2F2F2;
-}
-.blob-edit>.head .tab {
- padding: 4px 12px;
- margin-top: 7px;
}
.blob-edit>.head .tab a {
+ margin-top: 7px;
+ border-radius: 4px 4px 0 0;
+ padding: 4px 12px;
+ display: block;
color: #666;
text-decoration: none;
}
.blob-edit>.head .edit {
margin-left: 12px;
}
+.blob-edit>.head .save {
+ margin-left: 2px;
+}
.blob-edit>.head .options {
margin-top: 4px;
margin-right: -8px;
}
-.blob-edit>.head .active.tab {
- background: white;
- border: 1px solid #BBB;
- border-radius: 4px 4px 0 0;
- border-bottom: 1px solid white;
+.blob-edit>.head .tab:hover a {
+ background: #EEE;
}
.blob-edit>.head .active.tab a {
+ background: white;
+ border: 1px solid #BDBDBD;
+ border-bottom: 1px solid white;
font-weight: bold;
color: #333;
}
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
index 8f384b6051..748f629017 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
@@ -10,6 +10,7 @@ import com.turbodev.server.web.asset.clipboard.ClipboardResourceReference;
import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference;
import com.turbodev.server.web.asset.cookies.CookiesResourceReference;
import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference;
+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;
import com.turbodev.server.web.asset.hover.HoverResourceReference;
import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;
import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
@@ -33,6 +34,7 @@ public class SourceViewResourceReference extends BaseDependentResourceReference
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(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
index 7ad9bfb6c5..4b258e49c9 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -79,6 +79,8 @@ turbodev.server.sourceView = {
}
});
+ $code.find("textarea").attr("readonly", "readonly");
+
$code.mouseover(function(e) {
var node = e.target || e.srcElement, $node = $(node);
if ($node.hasClass("cm-property") || $node.hasClass("cm-variable") || $node.hasClass("cm-variable-2")
@@ -115,10 +117,6 @@ turbodev.server.sourceView = {
return turbodev.server.codemirror.setViewState(cm, viewState);
});
- $code[0].addEventListener("keydown", function(e) {
- $(document).trigger("keydown", e);
- });
-
$sourceView.on("autofit", function(event, width, height) {
if (cm.getOption("fullScreen"))
return;
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.html b/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.html
index ebbc96c41b..f998407b33 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.html
@@ -71,11 +71,11 @@
<div class="modal-body">
<div wicket:id="feedback"></div>
<div class="form-group">
- <label>Branch Name</label>
+ <label>Branch Name *</label>
<input wicket:id="name" class="form-control autofocus">
</div>
<div class="form-group">
- <label>Create From</label>
+ <label>Create From *</label>
<div>
<a wicket:id="revision" class="btn btn-default"></a>
</div>
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.java b/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.java
index 4497e3e038..e87980f145 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -50,7 +50,6 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.filter.RevFilter;
-import com.turbodev.utils.StringUtils;
import com.google.common.base.Preconditions;
import com.turbodev.server.TurboDev;
import com.turbodev.server.git.BlobIdent;
@@ -84,9 +83,10 @@ import com.turbodev.server.web.page.project.compare.RevisionComparePage;
import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;
import com.turbodev.server.web.page.project.pullrequest.requestlist.RequestListPage;
import com.turbodev.server.web.page.project.pullrequest.requestlist.SearchOption;
-import com.turbodev.server.web.page.project.pullrequest.requestlist.SortOption;
import com.turbodev.server.web.page.project.pullrequest.requestlist.SearchOption.Status;
+import com.turbodev.server.web.page.project.pullrequest.requestlist.SortOption;
import com.turbodev.server.web.util.PagingHistorySupport;
+import com.turbodev.utils.StringUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -341,7 +341,7 @@ public class ProjectBranchesPage extends ProjectPage {
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.canWrite(getProject()));
+ setVisible(SecurityUtils.canCreateBranch(getProject(), Constants.R_HEADS));
}
private RevisionPicker newRevisionPicker() {
@@ -406,13 +406,21 @@ public class ProjectBranchesPage extends ProjectPage {
target.focusComponent(nameInput);
target.add(form);
} else {
- projectModel.getObject().createBranch(branchName, branchRevision);
- modal.close();
- target.add(branchesContainer);
- target.add(pagingNavigator);
- target.add(noBranchesContainer);
- searchField.setModelObject(null);
- target.add(searchField);
+ Project project = getProject();
+ BranchProtection protection = project.getBranchProtection(branchName, getLoginUser());
+ if (protection != null && protection.isNoCreation()) {
+ form.error("Unable to create protected branch");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else {
+ project.createBranch(branchName, branchRevision);
+ modal.close();
+ target.add(branchesContainer);
+ target.add(pagingNavigator);
+ target.add(noBranchesContainer);
+ searchField.setModelObject(null);
+ target.add(searchField);
+ }
}
}
@@ -731,7 +739,7 @@ public class ProjectBranchesPage extends ProjectPage {
if (project.getDefaultBranch().equals(branch)) {
setEnabled(false);
} else {
- BranchProtection protection = project.getBranchProtection(branch);
+ BranchProtection protection = project.getBranchProtection(branch, getLoginUser());
setEnabled(protection == null || !protection.isNoDeletion());
}
} else {
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css b/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css
index 15e79e9cd0..6a4ac6e385 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css
+++ b/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css
@@ -1,14 +1,17 @@
#commit-detail>div {
- margin-bottom: 16px;
+ margin-bottom: 20px;
+}
+#commit-detail>div:LAST-CHILD {
+ margin-bottom: 0;
}
#commit-detail>.info {
- border: 1px solid #BBB;
+ border: 1px solid #E0E0E0;
border-radius: 4px;
}
#commit-detail>.info>.message {
background: #F9F9F9;
- border-bottom: 1px dashed #BBB;
+ border-bottom: 1px dashed #E0E0E0;
padding: 8px 12px;
border-radius: 4px 4px 0 0;
}
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css b/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css
index 77320f8da9..038f79b121 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css
+++ b/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css
@@ -1,6 +1,9 @@
#revision-compare>div {
margin-bottom: 20px;
}
+#revision-compare>div:LAST-CHILD {
+ margin-bottom: 0;
+}
#revision-compare>.revisions {
margin-bottom: 20px;
width: auto;
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java
index d15ad5570a..c9ced06951 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java
@@ -392,7 +392,7 @@ public class RequestOverviewPage extends RequestDetailPage {
sideInfoContainer.add(newMergeStrategyContainer());
sideInfoContainer.add(new ReviewerListPanel("reviewers", requestModel));
- BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch());
+ BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());
if (protection != null && !protection.getVerifications().isEmpty() && protection.isVerifyMerges()) {
sideInfoContainer.add(new Label("verifyMerges", "(On Merged Commit)"));
} else {
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.html b/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.html
index b4d58bca68..ddf9bcca5a 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.html
@@ -48,7 +48,7 @@
<div class="modal-body">
<div wicket:id="feedback"></div>
<div class="form-group">
- <label>Tag Name</label>
+ <label>Tag Name *</label>
<input wicket:id="name" class="form-control autofocus">
</div>
<div class="form-group">
@@ -56,7 +56,7 @@
<textarea wicket:id="message" rows="10" class="form-control"></textarea>
</div>
<div class="form-group">
- <label>Create From</label>
+ <label>Create From *</label>
<div>
<a wicket:id="revision" class="btn btn-default"></a>
</div>
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.java b/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.java
index 3bfe3af04c..836875b150 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.java
@@ -192,13 +192,21 @@ public class ProjectTagsPage extends ProjectPage {
target.focusComponent(nameInput);
target.add(form);
} else {
- getProject().tag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);
- modal.close();
- target.add(tagsContainer);
- target.add(pagingNavigator);
- target.add(noTagsContainer);
- searchField.setModelObject(null);
- target.add(searchField);
+ Project project = getProject();
+ TagProtection protection = project.getTagProtection(tagName, getLoginUser());
+ if (protection != null && protection.isNoCreation()) {
+ form.error("Unable to create protected tag");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else {
+ getProject().tag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);
+ modal.close();
+ target.add(tagsContainer);
+ target.add(pagingNavigator);
+ target.add(noTagsContainer);
+ searchField.setModelObject(null);
+ target.add(searchField);
+ }
}
}
@@ -343,7 +351,7 @@ public class ProjectTagsPage extends ProjectPage {
Project project = getProject();
if (SecurityUtils.canWrite(project)) {
- TagProtection protection = project.getTagProtection(tagName);
+ TagProtection protection = project.getTagProtection(tagName, getLoginUser());
setEnabled(protection == null || !protection.isNoDeletion());
} else {
setVisible(false);
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.html b/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.html
index 548d1a6841..8145dc09e6 100644
--- a/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.html
@@ -1,9 +1,6 @@
<wicket:extend>
<div id="forget" class="center-box">
- <div class="title">
- <i class="fa fa-ext fa-turbodev-logo"></i>
- <span>Password reset</span>
- </div>
+ <h1>Reset Password</h1>
<form wicket:id="form">
<div wicket:id="feedback"></div>
<div wicket:id="editor"></div>
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.java b/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.java
index c571d69270..af791795b4 100644
--- a/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.java
@@ -7,8 +7,6 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.shiro.authc.credential.PasswordService;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
@@ -113,13 +111,6 @@ public class ForgetPage extends BasePage {
add(form);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(CssHeaderItem.forReference(new ForgetResourceReference()));
- }
-
@Editable
public static class HelperBean implements Serializable {
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/ForgetResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/security/ForgetResourceReference.java
deleted file mode 100644
index 87568f38aa..0000000000
--- a/web/src/main/java/com/turbodev/server/web/page/security/ForgetResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.turbodev.server.web.page.security;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class ForgetResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ForgetResourceReference() {
- super(ForgetResourceReference.class, "forget.css");
- }
-
-}
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html b/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html
index bb87bbb835..b26e262a6d 100644
--- a/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div id="login" class="center-box">
- <h1><i class="fa fa-ext fa-turbodev-logo"></i> TurboDev Login</h1>
+ <h1>TurboDev Login</h1>
<div wicket:id="feedback"></div>
<form wicket:id="form" method="post">
<div class="input-group username">
@@ -14,7 +14,7 @@
<div class="row">
<div class="col-sm-6">
<div class="checkbox">
- <label><input wicket:id="rememberMe" type="checkbox"> Remember me on this computer</label>
+ <label><input wicket:id="rememberMe" type="checkbox"> Remember</label>
</div>
</div>
<div class="col-sm-6">
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.html b/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.html
index 3a6bcfcb20..6f88c11fc1 100644
--- a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div id="register" class="center-box">
- <h1><i class="fa fa-ext fa-turbodev-logo"></i> Register TurboDev User</h1>
+ <h1>Register User</h1>
<form wicket:id="form">
<div wicket:id="editor"></div>
<div class="actions">
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java b/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java
index a22de8eeb8..3afb3b136d 100644
--- a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java
@@ -3,8 +3,6 @@ package com.turbodev.server.web.page.security;
import org.apache.shiro.authc.credential.PasswordService;
import org.apache.shiro.authz.UnauthenticatedException;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.Link;
@@ -81,10 +79,4 @@ public class RegisterPage extends BasePage {
add(form);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new RegisterResourceReference()));
- }
-
}
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/RegisterResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/security/RegisterResourceReference.java
deleted file mode 100644
index ea8fb91a0e..0000000000
--- a/web/src/main/java/com/turbodev/server/web/page/security/RegisterResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.turbodev.server.web.page.security;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class RegisterResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public RegisterResourceReference() {
- super(RegisterResourceReference.class, "register.css");
- }
-
-}
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/forget.css b/web/src/main/java/com/turbodev/server/web/page/security/forget.css
deleted file mode 100644
index 8d2865d194..0000000000
--- a/web/src/main/java/com/turbodev/server/web/page/security/forget.css
+++ /dev/null
@@ -1,10 +0,0 @@
-#forget>.title {
- font-size: 32px;
- font-weight: bold;
- padding-bottom: 20px;
- border-bottom: 1px solid #BBB;
- margin-bottom: 20px;
-}
-#forget>.title .fa {
- font-size: 32px;
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/login.css b/web/src/main/java/com/turbodev/server/web/page/security/login.css
index 8821b6d916..2f94debe3b 100644
--- a/web/src/main/java/com/turbodev/server/web/page/security/login.css
+++ b/web/src/main/java/com/turbodev/server/web/page/security/login.css
@@ -1,11 +1,3 @@
-#login h1 {
- font-size: 32px;
- margin: 0 0 30px;
- font-weight: 300;
-}
-#login h1 .fa {
- font-size: 32px;
-}
#login .input-group-addon {
font-size: 18px;
color: #666;
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/register.css b/web/src/main/java/com/turbodev/server/web/page/security/register.css
deleted file mode 100644
index 1296eadc36..0000000000
--- a/web/src/main/java/com/turbodev/server/web/page/security/register.css
+++ /dev/null
@@ -1,8 +0,0 @@
-#register h1 {
- font-size: 32px;
- margin: 0 0 30px;
- font-weight: 300;
-}
-#register h1 .fa {
- font-size: 32px;
-}
diff --git a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html b/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html
index ffae30ec6f..144a80d726 100644
--- a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html
@@ -1,4 +1,3 @@
<wicket:extend>
<a wicket:id="test">test></a>
- <span class="label label-danger">hello</span>
</wicket:extend>
\ No newline at end of file