The Unified and Autonomous Development Platform
Issue custom field support
Robin Shen51e41775f087
diff --git a/core/.project b/core/.projectindex eedf8498c4..3e71023dae 100644--- a/core/.project+++ b/core/.project@@ -10,6 +10,11 @@<arguments></arguments></buildCommand>+ <buildCommand>+ <name>org.eclipse.wst.validation.validationbuilder</name>+ <arguments>+ </arguments>+ </buildCommand><buildCommand><name>org.eclipse.m2e.core.maven2Builder</name><arguments>diff --git a/core/pom.xml b/core/pom.xmlindex 89dc3a35b0..2248159d6d 100644--- a/core/pom.xml+++ b/core/pom.xml@@ -123,6 +123,11 @@<artifactId>xstream</artifactId><version>1.4.9</version></dependency>+ <dependency>+ <groupId>org.codehaus.groovy</groupId>+ <artifactId>groovy</artifactId>+ <version>${groovy.version}</version>+ </dependency><dependency><groupId>commons-codec</groupId><artifactId>commons-codec</artifactId>@@ -272,5 +277,6 @@<shiro.version>1.4.0</shiro.version><jgit.version>4.7.0.201704051617-r</jgit.version><flexmark.version>0.18.3</flexmark.version>+ <groovy.version>2.4.14</groovy.version></properties></project>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 0fbe75e2bd..2329668b60 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -35,6 +35,16 @@ import org.hibernate.collection.internal.PersistentBag;import org.hibernate.type.Type;import com.fasterxml.jackson.databind.ObjectMapper;+import com.google.inject.matcher.AbstractMatcher;+import com.google.inject.matcher.Matchers;+import com.thoughtworks.xstream.XStream;+import com.thoughtworks.xstream.annotations.XStreamOmitField;+import com.thoughtworks.xstream.converters.basic.NullConverter;+import com.thoughtworks.xstream.converters.extended.ISO8601DateConverter;+import com.thoughtworks.xstream.converters.extended.ISO8601SqlTimestampConverter;+import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;+import com.thoughtworks.xstream.core.JVM;+import com.thoughtworks.xstream.mapper.MapperWrapper;import io.onedev.launcher.bootstrap.Bootstrap;import io.onedev.launcher.loader.AbstractPlugin;@@ -63,6 +73,8 @@ import io.onedev.server.manager.ConfigManager;import io.onedev.server.manager.DataManager;import io.onedev.server.manager.GroupAuthorizationManager;import io.onedev.server.manager.GroupManager;+import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.MailManager;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.manager.MembershipManager;@@ -96,6 +108,8 @@ import io.onedev.server.manager.impl.DefaultConfigManager;import io.onedev.server.manager.impl.DefaultDataManager;import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;import io.onedev.server.manager.impl.DefaultGroupManager;+import io.onedev.server.manager.impl.DefaultIssueFieldManager;+import io.onedev.server.manager.impl.DefaultIssueManager;import io.onedev.server.manager.impl.DefaultMailManager;import io.onedev.server.manager.impl.DefaultMarkdownManager;import io.onedev.server.manager.impl.DefaultMembershipManager;@@ -139,11 +153,11 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.DefaultDao;import io.onedev.server.security.BasicAuthenticationFilter;import io.onedev.server.security.FilterChainConfigurator;-import io.onedev.server.security.OneDevAuthorizingRealm;-import io.onedev.server.security.OneDevFilterChainResolver;-import io.onedev.server.security.OneDevPasswordService;-import io.onedev.server.security.OneDevRememberMeManager;-import io.onedev.server.security.OneDevWebSecurityManager;+import io.onedev.server.security.OneAuthorizingRealm;+import io.onedev.server.security.OneFilterChainResolver;+import io.onedev.server.security.OnePasswordService;+import io.onedev.server.security.OneRememberMeManager;+import io.onedev.server.security.OneWebSecurityManager;import io.onedev.server.security.authenticator.Authenticator;import io.onedev.server.util.jackson.ObjectMapperConfigurator;import io.onedev.server.util.jackson.ObjectMapperProvider;@@ -157,17 +171,6 @@ import io.onedev.utils.ClassUtils;import io.onedev.utils.schedule.DefaultTaskScheduler;import io.onedev.utils.schedule.TaskScheduler;-import com.google.inject.matcher.AbstractMatcher;-import com.google.inject.matcher.Matchers;-import com.thoughtworks.xstream.XStream;-import com.thoughtworks.xstream.annotations.XStreamOmitField;-import com.thoughtworks.xstream.converters.basic.NullConverter;-import com.thoughtworks.xstream.converters.extended.ISO8601DateConverter;-import com.thoughtworks.xstream.converters.extended.ISO8601SqlTimestampConverter;-import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;-import com.thoughtworks.xstream.core.JVM;-import com.thoughtworks.xstream.mapper.MapperWrapper;-/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.*@@ -221,6 +224,8 @@ public class CoreModule extends AbstractPluginModule {bind(MailManager.class).to(DefaultMailManager.class);bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);+ bind(IssueManager.class).to(DefaultIssueManager.class);+ bind(IssueFieldManager.class).to(DefaultIssueFieldManager.class);bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);bind(VisitManager.class).to(DefaultVisitManager.class);@@ -248,12 +253,12 @@ public class CoreModule extends AbstractPluginModule {contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);- bind(Realm.class).to(OneDevAuthorizingRealm.class);- bind(RememberMeManager.class).to(OneDevRememberMeManager.class);- bind(WebSecurityManager.class).to(OneDevWebSecurityManager.class);- bind(FilterChainResolver.class).to(OneDevFilterChainResolver.class);+ bind(Realm.class).to(OneAuthorizingRealm.class);+ bind(RememberMeManager.class).to(OneRememberMeManager.class);+ bind(WebSecurityManager.class).to(OneWebSecurityManager.class);+ bind(FilterChainResolver.class).to(OneFilterChainResolver.class);bind(BasicAuthenticationFilter.class);- bind(PasswordService.class).to(OneDevPasswordService.class);+ bind(PasswordService.class).to(OnePasswordService.class);bind(ShiroFilter.class);install(new ShiroAopModule());contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {diff --git a/core/src/main/java/io/onedev/server/manager/IssueFieldManager.java b/core/src/main/java/io/onedev/server/manager/IssueFieldManager.javanew file mode 100644index 0000000000..e86b68fa51--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/IssueFieldManager.java@@ -0,0 +1,8 @@+package io.onedev.server.manager;++import io.onedev.server.model.IssueField;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueFieldManager extends EntityManager<IssueField> {++}diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.javanew file mode 100644index 0000000000..fafb141ec2--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java@@ -0,0 +1,22 @@+package io.onedev.server.manager;++import java.io.Serializable;+import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueManager extends EntityManager<Issue> {++ Class<? extends Serializable> defineCustomFieldsBeanClass(Project project);++ @Nullable+ Class<? extends Serializable> loadCustomFieldsBeanClass(String className);++ List<Issue> query(@Nullable Project project, User user);++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.javaindex 10e4ec4239..3ac4cbb799 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java@@ -16,6 +16,9 @@ import org.joda.time.format.DateTimeFormat;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;+import com.google.common.base.Throwables;+import com.google.common.collect.Lists;+import io.onedev.launcher.bootstrap.Bootstrap;import io.onedev.launcher.loader.Listen;import io.onedev.launcher.loader.ManagedSerializedForm;@@ -26,8 +29,8 @@ import io.onedev.server.manager.DataManager;import io.onedev.server.manager.MailManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Config;-import io.onedev.server.model.User;import io.onedev.server.model.Config.Key;+import io.onedev.server.model.User;import io.onedev.server.model.support.setting.BackupSetting;import io.onedev.server.model.support.setting.MailSetting;import io.onedev.server.model.support.setting.SecuritySetting;@@ -43,10 +46,6 @@ import io.onedev.utils.init.Skippable;import io.onedev.utils.schedule.SchedulableTask;import io.onedev.utils.schedule.TaskScheduler;-import com.google.common.base.Throwables;-import com.google.common.collect.Lists;-import com.google.common.collect.Sets;-@Singletonpublic class DefaultDataManager implements DataManager, Serializable {@@ -94,8 +93,7 @@ public class DefaultDataManager implements DataManager, Serializable {if (administrator == null) {administrator = new User();administrator.setId(User.ROOT_ID);- manualConfigs.add(new ManualConfig("Create Administator User", administrator,- Sets.newHashSet("description", "defaultPrivilege")) {+ manualConfigs.add(new ManualConfig("Create Administator User", administrator) {@Overridepublic Skippable getSkippable() {@@ -105,7 +103,7 @@ public class DefaultDataManager implements DataManager, Serializable {@Overridepublic void complete() {User user = (User) getSetting();- user.setPassword(passwordService.encryptPassword(user.getPassword()));+ user.setPassword(passwordService.encryptPassword("admin"));userManager.save(user, null);idManager.init(User.class);}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.javanew file mode 100644index 0000000000..e74bda8a68--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java@@ -0,0 +1,20 @@+package io.onedev.server.manager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.manager.IssueFieldManager;+import io.onedev.server.model.IssueField;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>+ implements IssueFieldManager {++ @Inject+ public DefaultIssueFieldManager(Dao dao) {+ super(dao);+ }++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javanew file mode 100644index 0000000000..54293bf2cc--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -0,0 +1,61 @@+package io.onedev.server.manager.impl;++import java.io.Serializable;+import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.manager.IssueManager;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.util.input.Input;++@Singleton+public class DefaultIssueManager extends AbstractEntityManager<Issue>+ implements IssueManager {++ private static final String CUSTOM_FIELDS_BEAN_PREFIX = "IssueCustomFieldsBean";++ private final ProjectManager projectManager;++ @Inject+ public DefaultIssueManager(Dao dao, ProjectManager projectManager) {+ super(dao);+ this.projectManager = projectManager;+ }++ @SuppressWarnings("unchecked")+ @Override+ public Class<? extends Serializable> defineCustomFieldsBeanClass(Project project) {+ String className = CUSTOM_FIELDS_BEAN_PREFIX + project.getId();++ return (Class<? extends Serializable>) Input.defineClass(className, project.getIssueWorkflow().getFieldSpecs());+ }++ @Override+ public Class<? extends Serializable> loadCustomFieldsBeanClass(String className) {+ if (className.startsWith(CUSTOM_FIELDS_BEAN_PREFIX)) {+ Long projectId = Long.valueOf(className.substring(CUSTOM_FIELDS_BEAN_PREFIX.length()));+ return defineCustomFieldsBeanClass(projectManager.load(projectId));+ } else {+ return null;+ }+ }++ @Sessional+ @Override+ public List<Issue> query(Project project, User user) {+ //Query<Issue> query = getSession().createQuery("select distinct issue from Issue as issue left join issue.fields as field with field.type='user' and field.value='admin' where issue.project.id=1");+ //query.setFirstResult(1);+ //query.setMaxResults(1);+ //return query.list();+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javanew file mode 100644index 0000000000..a69a6ed272--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -0,0 +1,124 @@+package io.onedev.server.model;++import java.util.ArrayList;+import java.util.Collection;++import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.Version;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Markdown;++@Entity+@Table(+ indexes={+ @Index(columnList="g_project_id"), @Index(columnList="state"),+ @Index(columnList="title"), @Index(columnList="g_reporter_id"),+ @Index(columnList="votes")})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@Editable+public class Issue extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @Version+ private long version;++ @Column(nullable=false)+ private String state;++ @Column(nullable=false)+ private String title;++ @Lob+ @Column(length=65535)+ private String description;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ private User reporter;++ private int votes;++ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueField> fields = new ArrayList<>();++ public long getVersion() {+ return version;+ }++ public String getState() {+ return state;+ }++ public void setState(String state) {+ this.state = state;+ }++ @Editable(order=100)+ public String getTitle() {+ return title;+ }++ public void setTitle(String title) {+ this.title = title;+ }++ @Editable(order=200)+ @Markdown+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public User getReporter() {+ return reporter;+ }++ public void setReporter(User reporter) {+ this.reporter = reporter;+ }++ public int getVotes() {+ return votes;+ }++ public void setVotes(int votes) {+ this.votes = votes;+ }++ public Collection<IssueField> getFields() {+ return fields;+ }++ public void setFields(Collection<IssueField> fields) {+ this.fields = fields;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/IssueComment.java b/core/src/main/java/io/onedev/server/model/IssueComment.javanew file mode 100644index 0000000000..e40089b355--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/IssueComment.java@@ -0,0 +1,80 @@+package io.onedev.server.model;++import java.util.Date;++import javax.persistence.Column;+import javax.persistence.FetchType;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.Version;++public class IssueComment extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @Version+ private long version;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn+ private User user;++ private String userName;++ @Lob+ @Column(nullable=false, length=65535)+ private String content;++ @Column(nullable=false)+ private Date date = new Date();++ public long getVersion() {+ return version;+ }++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ public String getUserName() {+ return userName;+ }++ public void setUserName(String userName) {+ this.userName = userName;+ }++ public String getContent() {+ return content;+ }++ public void setContent(String content) {+ this.content = content;+ }++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/IssueField.java b/core/src/main/java/io/onedev/server/model/IssueField.javanew file mode 100644index 0000000000..81a4e4f781--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/IssueField.java@@ -0,0 +1,64 @@+package io.onedev.server.model;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;++@Entity+@Table(+ indexes={+ @Index(columnList="g_issue_id"), @Index(columnList="name"),+ @Index(columnList="value"), @Index(columnList="type")})+public class IssueField extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Issue issue;++ @Column(nullable=false)+ private String name;++ private String value;++ @Column(nullable=false)+ private String type;++ public Issue getIssue() {+ return issue;+ }++ public void setIssue(Issue issue) {+ this.issue = issue;+ }++ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ public String getType() {+ return type;+ }++ public void setType(String type) {+ this.type = type;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex cd298216a1..e8d2c574e3 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -58,6 +58,10 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.annotations.DynamicUpdate;import org.hibernate.validator.constraints.NotEmpty;+import com.google.common.base.Optional;+import com.google.common.base.Preconditions;+import com.google.common.base.Throwables;+import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.OneDev;import io.onedev.server.event.RefUpdated;@@ -78,6 +82,7 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.CommitMessageTransformSetting;import io.onedev.server.model.support.TagProtection;+import io.onedev.server.model.support.issueworkflow.IssueWorkflow;import io.onedev.server.persistence.UnitOfWork;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.editable.annotation.Editable;@@ -90,10 +95,6 @@ import io.onedev.utils.PathUtils;import io.onedev.utils.Range;import io.onedev.utils.StringUtils;-import com.google.common.base.Optional;-import com.google.common.base.Preconditions;-import com.google.common.base.Throwables;-@Entity@Table(indexes={@Index(columnList="g_forkedFrom_id")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -166,6 +167,10 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<CodeComment> codeComments = new ArrayList<>();+ @Lob+ @Column(nullable=false, length=65535)+ private IssueWorkflow issueWorkflow = new IssueWorkflow();+private transient Repository repository;private transient Map<BlobIdent, Blob> blobCache;@@ -781,6 +786,14 @@ public class Project extends AbstractEntity {this.codeComments = codeComments;}+ public IssueWorkflow getIssueWorkflow() {+ return issueWorkflow;+ }++ public void setIssueWorkflow(IssueWorkflow issueWorkflow) {+ this.issueWorkflow = issueWorkflow;+ }+public long getVersion() {return version;}diff --git a/core/src/main/java/io/onedev/server/model/PullRequestComment.java b/core/src/main/java/io/onedev/server/model/PullRequestComment.javaindex 342fb0e1b8..d2cd72ec86 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestComment.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestComment.java@@ -33,6 +33,7 @@ public class PullRequestComment extends AbstractEntity {private long version;@ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)private PullRequest request;@ManyToOne(fetch=FetchType.LAZY)diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex 15f904536a..12dc809091 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -128,8 +128,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.name = name;}- @Editable(order=150, autocomplete="new-password")- @Password(confirmative=true)+ @Editable(order=150)+ @Password(confirmative=true, autoComplete="new-password")@JsonView(DefaultView.class)@NotEmptypublic String getPassword() {diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueAction.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueAction.javanew file mode 100644index 0000000000..f0ef52e2e2--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueAction.java@@ -0,0 +1,11 @@+package io.onedev.server.model.support.issueworkflow;++import io.onedev.server.model.support.submitter.Submitter;++public interface IssueAction {++ String getName();++ Submitter getSubmitter();++}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.javanew file mode 100644index 0000000000..be5d49f1b9--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.java@@ -0,0 +1,52 @@+package io.onedev.server.model.support.issueworkflow;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.InputContext;++public class IssueWorkflow implements Serializable, InputContext {++ private static final long serialVersionUID = 1L;++ private List<StateSpec> stateSpecs = new ArrayList<>();++ private List<Input> fieldSpecs = new ArrayList<>();++ public List<StateSpec> getStateSpecs() {+ return stateSpecs;+ }++ public void setStateSpecs(List<StateSpec> stateSpecs) {+ this.stateSpecs = stateSpecs;+ }++ public List<Input> getFieldSpecs() {+ return fieldSpecs;+ }++ public void setFieldSpecs(List<Input> fieldSpecs) {+ this.fieldSpecs = fieldSpecs;+ }++ @Override+ public List<String> getScenarios() {+ List<String> scenarios = new ArrayList<>();+ for (StateSpec state: getStateSpecs())+ scenarios.add(state.getName());+ return scenarios;+ }++ @Override+ public Map<String, Input> getInputs() {+ Map<String, Input> inputs = new LinkedHashMap<>();+ for (Input field: getFieldSpecs())+ inputs.put(field.getName(), field);+ return inputs;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.javanew file mode 100644index 0000000000..889413661b--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java@@ -0,0 +1,35 @@+package io.onedev.server.model.support.issueworkflow;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++public class StateSpec implements Serializable {++ private static final long serialVersionUID = 1L;++ public static final String OPEN = "open"; // reserved state++ public static final String CLOSED = "closed"; // reserved state++ private String name;++ private List<StateTransition> transitions = new ArrayList<>();++ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ public List<StateTransition> getTransitions() {+ return transitions;+ }++ public void setTransitions(List<StateTransition> transitions) {+ this.transitions = transitions;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.javanew file mode 100644index 0000000000..342450fd0d--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java@@ -0,0 +1,24 @@+package io.onedev.server.model.support.issueworkflow;++import java.io.Serializable;++import javax.annotation.Nullable;++public abstract class StateTransition implements Serializable {++ private static final long serialVersionUID = 1L;++ private String newState;++ @Nullable+ public abstract IssueAction getAction();++ public String getNewState() {+ return newState;+ }++ public void setNewState(String newState) {+ this.newState = newState;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/DiscardPullRequest.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/DiscardPullRequest.javanew file mode 100644index 0000000000..c2777f4b73--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/DiscardPullRequest.java@@ -0,0 +1,28 @@+package io.onedev.server.model.support.issueworkflow.statetransition;++import io.onedev.server.model.support.issueworkflow.IssueAction;+import io.onedev.server.model.support.issueworkflow.StateTransition;+import io.onedev.server.util.editable.annotation.Editable;++@Editable(order=200)+public class DiscardPullRequest extends StateTransition {++ private static final long serialVersionUID = 1L;++ private String targetBranch;++ @Override+ public IssueAction getAction() {+ return null;+ }++ @Editable+ public String getTargetBranch() {+ return targetBranch;+ }++ public void setTargetBranch(String targetBranch) {+ this.targetBranch = targetBranch;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/MergePullRequest.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/MergePullRequest.javanew file mode 100644index 0000000000..68ed942c76--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/MergePullRequest.java@@ -0,0 +1,28 @@+package io.onedev.server.model.support.issueworkflow.statetransition;++import io.onedev.server.model.support.issueworkflow.IssueAction;+import io.onedev.server.model.support.issueworkflow.StateTransition;+import io.onedev.server.util.editable.annotation.Editable;++@Editable(order=300)+public class MergePullRequest extends StateTransition {++ private static final long serialVersionUID = 1L;++ private String targetBranch;++ @Override+ public IssueAction getAction() {+ return null;+ }++ @Editable+ public String getTargetBranch() {+ return targetBranch;+ }++ public void setTargetBranch(String targetBranch) {+ this.targetBranch = targetBranch;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/OpenPullRequest.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/OpenPullRequest.javanew file mode 100644index 0000000000..3e013d8421--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/OpenPullRequest.java@@ -0,0 +1,28 @@+package io.onedev.server.model.support.issueworkflow.statetransition;++import io.onedev.server.model.support.issueworkflow.IssueAction;+import io.onedev.server.model.support.issueworkflow.StateTransition;+import io.onedev.server.util.editable.annotation.Editable;++@Editable(order=200)+public class OpenPullRequest extends StateTransition {++ private static final long serialVersionUID = 1L;++ private String targetBranch;++ @Override+ public IssueAction getAction() {+ return null;+ }++ @Editable+ public String getTargetBranch() {+ return targetBranch;+ }++ public void setTargetBranch(String targetBranch) {+ this.targetBranch = targetBranch;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/PressButton.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/PressButton.javanew file mode 100644index 0000000000..53c7ffe4dd--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/statetransition/PressButton.java@@ -0,0 +1,42 @@+package io.onedev.server.model.support.issueworkflow.statetransition;++import io.onedev.server.model.support.issueworkflow.IssueAction;+import io.onedev.server.model.support.issueworkflow.StateTransition;+import io.onedev.server.model.support.submitter.Submitter;+import io.onedev.server.util.editable.annotation.Editable;++@Editable(order=100)+public class PressButton extends StateTransition implements IssueAction {++ private static final long serialVersionUID = 1L;++ private String name;++ private Submitter submitter;++ @Override+ public IssueAction getAction() {+ return this;+ }++ @Editable(order=100)+ @Override+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200)+ @Override+ public Submitter getSubmitter() {+ return submitter;+ }++ public void setSubmitter(Submitter submitter) {+ this.submitter = submitter;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/setting/MailSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/MailSetting.javaindex 5b093aace8..d03699ed41 100644--- a/core/src/main/java/io/onedev/server/model/support/setting/MailSetting.java+++ b/core/src/main/java/io/onedev/server/model/support/setting/MailSetting.java@@ -70,10 +70,10 @@ public class MailSetting implements Serializable {this.smtpUser = smtpUser;}- @Editable(order=400, name="SMTP Password", autocomplete="new-password", description=+ @Editable(order=400, name="SMTP Password", description="Optionally specify password here if the SMTP host needs authentication")- @Password+ @Password(autoComplete="new-password")public String getSmtpPassword() {return smtpPassword;}diff --git a/core/src/main/java/io/onedev/server/security/OneDevAuthorizingRealm.java b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/security/OneDevAuthorizingRealm.javarename to core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex 20c07eb538..a766538d3a 100644--- a/core/src/main/java/io/onedev/server/security/OneDevAuthorizingRealm.java+++ b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -49,9 +49,9 @@ import io.onedev.utils.StringUtils;import com.google.common.base.Throwables;@Singleton-public class OneDevAuthorizingRealm extends AuthorizingRealm {+public class OneAuthorizingRealm extends AuthorizingRealm {- private static final Logger logger = LoggerFactory.getLogger(OneDevAuthorizingRealm.class);+ private static final Logger logger = LoggerFactory.getLogger(OneAuthorizingRealm.class);private final UserManager userManager;@@ -64,7 +64,7 @@ public class OneDevAuthorizingRealm extends AuthorizingRealm {private final GroupManager groupManager;@Inject- public OneDevAuthorizingRealm(UserManager userManager, CacheManager cacheManager, ConfigManager configManager,+ public OneAuthorizingRealm(UserManager userManager, CacheManager cacheManager, ConfigManager configManager,MembershipManager membershipManager, GroupManager groupManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));diff --git a/core/src/main/java/io/onedev/server/security/OneDevFilterChainResolver.java b/core/src/main/java/io/onedev/server/security/OneFilterChainResolver.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/security/OneDevFilterChainResolver.javarename to core/src/main/java/io/onedev/server/security/OneFilterChainResolver.javaindex 1aec3f2f62..fb3a07a6af 100644--- a/core/src/main/java/io/onedev/server/security/OneDevFilterChainResolver.java+++ b/core/src/main/java/io/onedev/server/security/OneFilterChainResolver.java@@ -9,10 +9,10 @@ import org.apache.shiro.web.filter.mgt.FilterChainManager;import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;@Singleton-public class OneDevFilterChainResolver extends PathMatchingFilterChainResolver {+public class OneFilterChainResolver extends PathMatchingFilterChainResolver {@Inject- public OneDevFilterChainResolver(+ public OneFilterChainResolver(Set<FilterChainConfigurator> filterChainConfigurators,BasicAuthenticationFilter basicAuthenticationFilter) {diff --git a/core/src/main/java/io/onedev/server/security/OneDevPasswordService.java b/core/src/main/java/io/onedev/server/security/OnePasswordService.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/security/OneDevPasswordService.javarename to core/src/main/java/io/onedev/server/security/OnePasswordService.javaindex 81265c0194..e36f4ae1f6 100644--- a/core/src/main/java/io/onedev/server/security/OneDevPasswordService.java+++ b/core/src/main/java/io/onedev/server/security/OnePasswordService.java@@ -9,7 +9,7 @@ import com.pmease.security.shiro.bcrypt.BCryptPasswordService;import io.onedev.utils.StringUtils;@Singleton-public class OneDevPasswordService implements PasswordService {+public class OnePasswordService implements PasswordService {private final PasswordService bcryptPasswordService = new BCryptPasswordService();diff --git a/core/src/main/java/io/onedev/server/security/OneDevRememberMeManager.java b/core/src/main/java/io/onedev/server/security/OneRememberMeManager.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/security/OneDevRememberMeManager.javarename to core/src/main/java/io/onedev/server/security/OneRememberMeManager.javaindex 22910c13d2..abc92179bf 100644--- a/core/src/main/java/io/onedev/server/security/OneDevRememberMeManager.java+++ b/core/src/main/java/io/onedev/server/security/OneRememberMeManager.java@@ -9,12 +9,12 @@ import org.apache.shiro.web.mgt.CookieRememberMeManager;import io.onedev.server.manager.UserManager;@Singleton-public class OneDevRememberMeManager extends CookieRememberMeManager {+public class OneRememberMeManager extends CookieRememberMeManager {private final UserManager userManager;@Inject- public OneDevRememberMeManager(UserManager userManager) {+ public OneRememberMeManager(UserManager userManager) {this.userManager = userManager;}diff --git a/core/src/main/java/io/onedev/server/security/OneDevWebEnvironment.java b/core/src/main/java/io/onedev/server/security/OneWebEnvironment.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/security/OneDevWebEnvironment.javarename to core/src/main/java/io/onedev/server/security/OneWebEnvironment.javaindex 9ae86cb5c0..a6c95e79d7 100644--- a/core/src/main/java/io/onedev/server/security/OneDevWebEnvironment.java+++ b/core/src/main/java/io/onedev/server/security/OneWebEnvironment.java@@ -9,7 +9,7 @@ import org.apache.shiro.web.mgt.WebSecurityManager;import io.onedev.server.OneDev;-public class OneDevWebEnvironment extends DefaultWebEnvironment implements Initializable, Destroyable {+public class OneWebEnvironment extends DefaultWebEnvironment implements Initializable, Destroyable {@Overridepublic void init() throws ShiroException {diff --git a/core/src/main/java/io/onedev/server/security/OneDevWebSecurityManager.java b/core/src/main/java/io/onedev/server/security/OneWebSecurityManager.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/security/OneDevWebSecurityManager.javarename to core/src/main/java/io/onedev/server/security/OneWebSecurityManager.javaindex fd42eb1b21..9a7e8859ab 100644--- a/core/src/main/java/io/onedev/server/security/OneDevWebSecurityManager.java+++ b/core/src/main/java/io/onedev/server/security/OneWebSecurityManager.java@@ -18,10 +18,10 @@ import org.apache.shiro.web.subject.WebSubjectContext;import org.apache.shiro.web.subject.support.WebDelegatingSubject;@Singleton-public class OneDevWebSecurityManager extends org.apache.shiro.web.mgt.DefaultWebSecurityManager {+public class OneWebSecurityManager extends org.apache.shiro.web.mgt.DefaultWebSecurityManager {@Inject- public OneDevWebSecurityManager(Realm realm, RememberMeManager rememberMeManager) {+ public OneWebSecurityManager(Realm realm, RememberMeManager rememberMeManager) {setSubjectFactory(new DefaultWebSubjectFactory() {diff --git a/core/src/main/java/io/onedev/server/util/Constants.java b/core/src/main/java/io/onedev/server/util/Constants.javanew file mode 100644index 0000000000..7559f6a6f5--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/Constants.java@@ -0,0 +1,16 @@+package io.onedev.server.util;++import org.joda.time.format.DateTimeFormat;+import org.joda.time.format.DateTimeFormatter;++public class Constants {++ public static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm";++ public static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormat.forPattern(DATETIME_FORMAT);++ public static final String DATE_FORMAT = "yyyy-MM-dd";++ public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormat.forPattern(DATE_FORMAT);++}diff --git a/core/src/main/java/io/onedev/server/util/EditContext.java b/core/src/main/java/io/onedev/server/util/EditContext.javanew file mode 100644index 0000000000..abeb7c487a--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/EditContext.java@@ -0,0 +1,7 @@+package io.onedev.server.util;++public interface EditContext {++ Object getOnScreenValue(String name);++}diff --git a/core/src/main/java/io/onedev/server/util/GroovyUtils.java b/core/src/main/java/io/onedev/server/util/GroovyUtils.javanew file mode 100644index 0000000000..71aaaf7977--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -0,0 +1,83 @@+package io.onedev.server.util;++import java.util.HashMap;+import java.util.Map;++import org.unbescape.java.JavaEscape;++import com.google.common.collect.MapMaker;++import groovy.lang.Binding;+import groovy.lang.GroovyClassLoader;+import groovy.lang.Script;++public class GroovyUtils {++ private static Map<String, Class<?>> scriptClassCache = new MapMaker().weakValues().makeMap();++ public static Class<?> compile(String script) {+ Class<?> scriptClass = scriptClassCache.get(script);+ if (scriptClass == null) {+ scriptClass = new GroovyClassLoader(GroovyUtils.class.getClassLoader()).parseClass(script);+ scriptClassCache.put(script, scriptClass);+ }+ return scriptClass;+ }++ private static Binding getBinding(Map<String, Object> variables) {+ return new Binding() {++ @Override+ public Object getVariable(String name) {+ if (name.equals("onedev"))+ return OneContext.get();+ else if (variables.containsKey(name))+ return variables.get(name);+ else+ return super.getVariable(name);+ }++ @Override+ public void setVariable(String name, Object value) {+ throw new UnsupportedOperationException();+ }++ };+ }++ public static Object evalScript(String scriptText, Map<String, Object> variables) {+ try {+ Class<?> scriptClass = compile(scriptText);+ Script script;+ try {+ Object instance = scriptClass.newInstance();+ if (!(instance instanceof Script))+ return scriptClass;+ else+ script = (Script) instance;+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ script.setBinding(getBinding(variables));+ return script.run();+ } catch (RuntimeException e) {+ throw new ScriptException(scriptText, e);+ }+ }++ public static Object evalScript(String scriptText) {+ return evalScript(scriptText, new HashMap<>());+ }++ public static String evalGString(String gstring, Map<String, Object> variables) {+ if (gstring.contains("$"))+ return evalScript("\"" + JavaEscape.escapeJava(gstring) + "\"", variables).toString();+ else+ return gstring;+ }++ public static String evalGString(String gstring) {+ return evalGString(gstring, new HashMap<>());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/OneContext.java b/core/src/main/java/io/onedev/server/util/OneContext.javanew file mode 100644index 0000000000..59b5e39d19--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/OneContext.java@@ -0,0 +1,58 @@+package io.onedev.server.util;++import java.util.Stack;++import javax.annotation.Nullable;++import io.onedev.launcher.loader.AppLoader;+import io.onedev.server.OneDev;+import io.onedev.server.model.Project;+import io.onedev.server.util.input.InputContext;++public abstract class OneContext {++ private static ThreadLocal<Stack<OneContext>> stack = new ThreadLocal<Stack<OneContext>>() {++ @Override+ protected Stack<OneContext> initialValue() {+ return new Stack<OneContext>();+ }++ };++ public static void push(OneContext context) {+ stack.get().push(context);+ }++ public static void pop() {+ stack.get().pop();+ }++ @Nullable+ public static OneContext get() {+ if (!stack.get().isEmpty())+ return stack.get().peek();+ else+ return null;+ }++ public <T> T getInstance(Class<T> type) {+ return AppLoader.getInstance(type);+ }++ @Nullable+ public abstract Project getProject();++ public String getDocLink() {+ return OneDev.getInstance().getDocLink();+ }++ public abstract EditContext getEditContext(int level);++ public EditContext getEditContext() {+ return getEditContext(0);+ }++ public abstract InputContext getInputContext();++}diff --git a/core/src/main/java/io/onedev/server/util/ScriptException.java b/core/src/main/java/io/onedev/server/util/ScriptException.javanew file mode 100644index 0000000000..65c91c4513--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/ScriptException.java@@ -0,0 +1,11 @@+package io.onedev.server.util;++public class ScriptException extends RuntimeException {++ private static final long serialVersionUID = 1L;++ public ScriptException(String script, RuntimeException cause) {+ super("Error evaluating script:\n" + script, cause);+ }++}diff --git a/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java b/core/src/main/java/io/onedev/server/util/editable/EditableUtils.javaindex 6c23cad63f..6100130036 100644--- a/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java+++ b/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java@@ -63,22 +63,6 @@ public class EditableUtils {return null;}- /**- * Get autocomplete attribute of specified element from autocomplete parameter of {@link Editable} annotation.- *- * @param element- * annotated element to get autocomplete from- * @return- * autocomplete attribute of specified element, or <tt>null</tt> if not defined- */- public static @Nullable String getAutocomplete(AnnotatedElement element) {- Editable editable = element.getAnnotation(Editable.class);- if (editable != null && editable.autocomplete().trim().length() != 0)- return editable.autocomplete();- else- return null;- }-/*** Get icon of specified element from icon parameter of {@link Editable} annotation.*@@ -108,16 +92,6 @@ public class EditableUtils {if (editable != null) {if (editable.description().length() != 0)return editable.description();- if (editable.descriptionProvider().length() != 0) {- Class<?> clazz;- if (element instanceof Method)- clazz = ((Method) element).getDeclaringClass();- else if (element instanceof Class)- clazz = (Class<?>) element;- else- clazz = ((Field) element).getDeclaringClass();- return (String) ReflectionUtils.invokeStaticMethod(clazz, editable.descriptionProvider());- }}return null;}@@ -168,9 +142,8 @@ public class EditableUtils {public static boolean hasEditableProperties(Class<?> beanClass) {for (Method getter: BeanUtils.findGetters(ClassUtils.unproxy(beanClass))) {Method setter = BeanUtils.findSetter(getter);- if (setter != null && getter.getAnnotation(Editable.class) != null) {+ if (setter != null && getter.getAnnotation(Editable.class) != null)return true;- }}return false;}diff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/AutoComplete.java b/core/src/main/java/io/onedev/server/util/editable/annotation/AutoComplete.javanew file mode 100644index 0000000000..9236fd26f8--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/AutoComplete.java@@ -0,0 +1,20 @@+/*+ * Copyright OneDev (c) 2005-2008,+ * Date: Feb 24, 2008+ * Time: 4:29:05 PM+ * All rights reserved.+ *+ * Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $+ */+package io.onedev.server.util.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+public @interface AutoComplete {+ String value() default "";+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/editable/annotation/DefaultValueProvider.javanew file mode 100644index 0000000000..90e757dec3--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/DefaultValueProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.util.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+public @interface DefaultValueProvider {+ String value();+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/Editable.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Editable.javaindex 4beccfeb82..0a23c69e45 100644--- a/core/src/main/java/io/onedev/server/util/editable/annotation/Editable.java+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Editable.java@@ -17,8 +17,4 @@ public @interface Editable {int order() default 0;String description() default "";-- String descriptionProvider() default "";-- String autocomplete() default "";}diff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/GroupChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/GroupChoice.javaindex b764a4c65f..5f1072e98c 100644--- a/core/src/main/java/io/onedev/server/util/editable/annotation/GroupChoice.java+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/GroupChoice.java@@ -8,4 +8,5 @@ import java.lang.annotation.Target;@Target(ElementType.METHOD)@Retention(RetentionPolicy.RUNTIME)public @interface GroupChoice {+ String value() default "";}diff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/NullChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/NameOfEmptyValue.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/util/editable/annotation/NullChoice.javarename to core/src/main/java/io/onedev/server/util/editable/annotation/NameOfEmptyValue.javaindex a95ca86985..2774fc2d98 100644--- a/core/src/main/java/io/onedev/server/util/editable/annotation/NullChoice.java+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/NameOfEmptyValue.java@@ -7,6 +7,6 @@ import java.lang.annotation.Target;@Retention(RetentionPolicy.RUNTIME)@Target(ElementType.METHOD)-public @interface NullChoice {+public @interface NameOfEmptyValue {String value();}diff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/Password.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Password.javaindex 89e08099ad..7fd4442b43 100644--- a/core/src/main/java/io/onedev/server/util/editable/annotation/Password.java+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Password.java@@ -9,4 +9,6 @@ import java.lang.annotation.Target;@Retention(RetentionPolicy.RUNTIME)public @interface Password {boolean confirmative() default false;++ String autoComplete() default "";}diff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/Script.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Script.javanew file mode 100644index 0000000000..eb2ef84256--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Script.java@@ -0,0 +1,19 @@+/*+ * Copyright OneDev (c) 2005-2008,+ * Date: Feb 24, 2008+ * Time: 4:29:05 PM+ * All rights reserved.+ *+ * Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $+ */+package io.onedev.server.util.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+public @interface Script {+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/ShowCondition.java b/core/src/main/java/io/onedev/server/util/editable/annotation/ShowCondition.javanew file mode 100644index 0000000000..2c429f642a--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/ShowCondition.java@@ -0,0 +1,12 @@+package io.onedev.server.util.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Retention(RetentionPolicy.RUNTIME)+@Target({ElementType.TYPE, ElementType.METHOD})+public @interface ShowCondition {+ String value();+}diff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/UserChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/UserChoice.javaindex de5bd97dc8..0f1dc3ded2 100644--- a/core/src/main/java/io/onedev/server/util/editable/annotation/UserChoice.java+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/UserChoice.java@@ -8,8 +8,5 @@ import java.lang.annotation.Target;@Target(ElementType.METHOD)@Retention(RetentionPolicy.RUNTIME)public @interface UserChoice {-- public enum Type{ALL, PROJECT_READER, PROJECT_WRITER, PROJECT_ADMINISTRATOR}-- Type type() default Type.ALL;+ String value() default "";}diff --git a/core/src/main/java/io/onedev/server/util/input/Input.java b/core/src/main/java/io/onedev/server/util/input/Input.javanew file mode 100644index 0000000000..2fd93d7fc4--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/Input.java@@ -0,0 +1,272 @@+package io.onedev.server.util.input;++import java.io.Serializable;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;+import javax.validation.constraints.Size;++import org.apache.commons.lang.SerializationUtils;+import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.java.JavaEscape;++import com.google.common.collect.Lists;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.ChoiceProvider;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.input.showcondition.ShowCondition;++@Editable+public abstract class Input implements Serializable {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(Input.class);++ public static final String BOOLEAN = "Boolean";++ public static final String TEXT = "Text";++ public static final String DATE = "Date";++ public static final String PASSWORD = "Password";++ public static final String NUMBER = "Number";++ public static final String CHOICE = "Choice";++ public static final String MULTI_CHOICE = "Multi-choice";++ public static final String USER_CHOICE = "User choice";++ public static final String USER_MULTI_CHOICE = "User multi-choice";++ public static final String GROUP_CHOICE = "Group choice";++ public static final String GROUP_MULTI_CHOICE = "Group multi-choice";++ private String name;++ private List<String> scenarios;++ private String description;++ private boolean allowEmpty;++ private String nameOfEmptyValue;++ private ShowCondition showCondition;++ @Editable(order=10, description="Name of the custom input")+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(name="resource.input.scenariosName", order=20, description="resource.input.scenariosDescription")+ @ChoiceProvider("getScenarioChoices")+ @Size(min=1, max=100)+ public List<String> getScenarios() {+ return scenarios;+ }++ public void setScenarios(List<String> scenarios) {+ this.scenarios = scenarios;+ }++ @Editable(order=30, description="resource.input.description")+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ @Editable(order=40, name="Show Conditionally", description="resource.input.showCondition")+ @NameOfEmptyValue("Always")+ public ShowCondition getShowCondition() {+ return showCondition;+ }++ public void setShowCondition(ShowCondition showCondition) {+ this.showCondition = showCondition;+ }++ @Editable(order=50, name="Allow Empty Value", description="resource.input.allowEmpty")+ public boolean isAllowEmpty() {+ return allowEmpty;+ }++ public void setAllowEmpty(boolean allowEmpty) {+ this.allowEmpty = allowEmpty;+ }++ @Editable(order=60)+ @io.onedev.server.util.editable.annotation.ShowCondition("isNameOfEmptyValueVisible")+ @NotEmpty+ public String getNameOfEmptyValue() {+ return nameOfEmptyValue;+ }++ public void setNameOfEmptyValue(String nameOfEmptyValue) {+ this.nameOfEmptyValue = nameOfEmptyValue;+ }++ @SuppressWarnings("unused")+ private static boolean isNameOfEmptyValueVisible() {+ return (boolean) OneContext.get().getEditContext().getOnScreenValue("allowEmpty");+ }++ public List<String> getPossibleValues() {+ return Lists.newArrayList();+ }++ protected String escape(String string) {+ String escaped = JavaEscape.escapeJava(string);+ // escape $ character since it has special meaning in groovy string+ escaped = escaped.replace("$", "\\$");++ return escaped;+ }++ public abstract String getPropertyDef(Map<String, Integer> indexes);++ protected String getLiteral(byte[] bytes) {+ StringBuffer buffer = new StringBuffer("[");+ for (byte eachByte: bytes) {+ buffer.append(String.format("%d", eachByte)).append(",");+ }+ buffer.append("] as byte[]");+ return buffer.toString();+ }++ protected void appendField(StringBuffer buffer, int index, String type) {+ buffer.append(" private " + type + " input" + index + ";\n");+ buffer.append("\n");+ }++ protected void appendAnnotations(StringBuffer buffer, int index, String notEmptyAnnotation,+ @Nullable String choiceAnnotation, boolean hasDefaultValueProvider) {+ if (description != null) {+ buffer.append(" @Editable(name=\"" + escape(name) + "\", description=\"" ++ escape(description) + "\", order=" + index + ")\n");+ } else {+ buffer.append(" @Editable(name=\"" + escape(name) ++ "\", order=" + index + ")\n");+ }+ if (!allowEmpty)+ buffer.append(" @" + notEmptyAnnotation + "\n");+ if (showCondition != null)+ buffer.append(" @ShowCondition(\"isInput" + index + "Visible\")\n");+ if (choiceAnnotation != null)+ buffer.append(" @" + choiceAnnotation + "(\"getInput" + index + "Choices\")\n");+ if (hasDefaultValueProvider)+ buffer.append(" @DefaultValueProvider(\"getDefaultInput" + index + "\")\n");+ }++ protected void appendMethods(StringBuffer buffer, int index, String type,+ @Nullable Serializable choiceProvider, @Nullable Serializable defaultValueProvider) {+ buffer.append(" public " + type + " getInput" + index + "() {\n");+ buffer.append(" return input" + index + ";\n");+ buffer.append(" }\n");+ buffer.append("\n");++ buffer.append(" public void setInput" + index + "(" + type + " value) {\n");+ buffer.append(" this.input" + index + "=value;\n");+ buffer.append(" }\n");+ buffer.append("\n");++ if (showCondition != null) {+ buffer.append(" private static boolean isInput" + index + "Visible() {\n");+ String literalBytes = getLiteral(SerializationUtils.serialize(showCondition));+ buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").isVisible();\n");+ buffer.append(" }\n");+ buffer.append("\n");+ }++ if (choiceProvider != null) {+ buffer.append(" private static List getInput" + index + "Choices() {\n");+ String literalBytes = getLiteral(SerializationUtils.serialize(choiceProvider));+ buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getChoices(false);\n");+ buffer.append(" }\n");+ buffer.append("\n");+ }++ if (defaultValueProvider != null) {+ buffer.append(" private static " + type + " getDefaultInput" + index + "() {\n");+ String literalBytes = getLiteral(SerializationUtils.serialize(defaultValueProvider));+ buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();\n");+ buffer.append(" }\n");+ buffer.append("\n");+ }+ }++ public boolean isUsingInput(String inputName) {+ if (showCondition != null && inputName.equals(showCondition.getInputName())) {+ return true;+ } else {+ return false;+ }+ }++ public void onInputRename(String oldName, String newName) {+ if (showCondition != null && oldName.equals(showCondition.getInputName())) {+ showCondition.setInputName(newName);+ }+ }++ @SuppressWarnings("unused")+ private static List<String> getScenarioChoices() {+ return OneContext.get().getInputContext().getScenarios();+ }++ public static Class<?> defineClass(String className, List<Input> inputs) {+ StringBuffer buffer = new StringBuffer();+ buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");+ buffer.append("import io.onedev.server.util.editable.annotation.*;\n");+ buffer.append("import io.onedev.util.*;\n");+ buffer.append("import io.onedev.server.util.*;\n");+ buffer.append("import io.onedev.server.util.facade.*;\n");+ buffer.append("import java.util.*;\n");+ buffer.append("import javax.validation.constraints.*;\n");+ buffer.append("import org.hibernate.validator.constraints.*;\n");+ buffer.append("\n");+ buffer.append("@Editable\n");+ buffer.append("class " + className + " implements java.io.Serializable {\n");+ buffer.append("\n");+ buffer.append(" private static final long serialVersionUID = 1L;\n");+ buffer.append("\n");+ Map<String, Integer> indexes = new HashMap<>();+ int index = 1;+ for (Input input: inputs)+ indexes.put(input.getName(), index++);+ for (Input input: inputs)+ buffer.append(input.getPropertyDef(indexes));++ buffer.append("}\n");+ buffer.append("return " + className + ";\n");++ logger.trace("Class definition script:\n" + buffer.toString());++ return (Class<?>) GroovyUtils.evalScript(buffer.toString(), new HashMap<>());+ }++ @Nullable+ public abstract String toString(@Nullable Object object);++ @Nullable+ public abstract Object toObject(@Nullable String string);++}diff --git a/core/src/main/java/io/onedev/server/util/input/InputContext.java b/core/src/main/java/io/onedev/server/util/input/InputContext.javanew file mode 100644index 0000000000..e96ef2daa4--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/InputContext.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input;++import java.util.List;+import java.util.Map;++public interface InputContext {++ List<String> getScenarios();++ Map<String, Input> getInputs();++}diff --git a/core/src/main/java/io/onedev/server/util/input/booleaninput/BooleanInput.java b/core/src/main/java/io/onedev/server/util/input/booleaninput/BooleanInput.javanew file mode 100644index 0000000000..ea1c535db4--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/booleaninput/BooleanInput.java@@ -0,0 +1,68 @@+package io.onedev.server.util.input.booleaninput;++import java.util.List;+import java.util.Map;++import javax.validation.constraints.NotNull;++import com.google.common.collect.Lists;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.booleaninput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.input.booleaninput.defaultvalueprovider.FalseDefaultValue;++@Editable(order=300, name=Input.BOOLEAN)+public class BooleanInput extends Input {++ private static final long serialVersionUID = 1L;++ private DefaultValueProvider defaultValueProvider = new FalseDefaultValue();++ @Editable(name="Default Value", order=1000)+ @NotNull+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ return Lists.newArrayList("true", "false");+ }++ @Editable+ @Override+ public boolean isAllowEmpty() {+ return false;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());++ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "Boolean");+ appendAnnotations(buffer, index, "NotNull", null, defaultValueProvider!=null);+ appendMethods(buffer, index, "Boolean", null, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return Boolean.valueOf(string);+ }++ @Override+ public String toString(Object value) {+ if (value != null)+ return ((Boolean)value)?"true":"false";+ else+ return "false";+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..7b552a7d18--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input.booleaninput.defaultvalueprovider;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ boolean getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/FalseDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/FalseDefaultValue.javanew file mode 100644index 0000000000..a687a0315a--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/FalseDefaultValue.java@@ -0,0 +1,15 @@+package io.onedev.server.util.input.booleaninput.defaultvalueprovider;++import io.onedev.server.util.editable.annotation.Editable;++@Editable(order=200, name="false")+public class FalseDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public boolean getDefaultValue() {+ return false;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..75f06cf1dd--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,37 @@+package io.onedev.server.util.input.booleaninput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return a <i>boolean</i> value. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @Override+ public boolean getDefaultValue() {+ return (boolean) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/TrueDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/TrueDefaultValue.javanew file mode 100644index 0000000000..155ff87b10--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/booleaninput/defaultvalueprovider/TrueDefaultValue.java@@ -0,0 +1,15 @@+package io.onedev.server.util.input.booleaninput.defaultvalueprovider;++import io.onedev.server.util.editable.annotation.Editable;++@Editable(order=100, name="true")+public class TrueDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public boolean getDefaultValue() {+ return true;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/choiceinput/ChoiceInput.java b/core/src/main/java/io/onedev/server/util/input/choiceinput/ChoiceInput.javanew file mode 100644index 0000000000..aa50541f8a--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/choiceinput/ChoiceInput.java@@ -0,0 +1,76 @@+package io.onedev.server.util.input.choiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.Validator;+import javax.validation.constraints.NotNull;++import io.onedev.server.OneDev;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.choiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.input.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.input.choiceprovider.ChoiceProvider;++@Editable(order=145, name=Input.CHOICE)+public class ChoiceInput extends Input {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new SpecifiedChoices();++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty())+ return getChoiceProvider().getChoices(true);+ else+ return new ArrayList<>();+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "String");+ appendAnnotations(buffer, index, "NotEmpty", "ChoiceProvider", defaultValueProvider!=null);+ appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return string;+ }++ @Override+ public String toString(Object value) {+ return (String) value;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..3bc2b04f1c--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input.choiceinput.defaultvalueprovider;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ String getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..dcf32fb88b--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,37 @@+package io.onedev.server.util.input.choiceinput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return a <i>string</i> value. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @Override+ public String getDefaultValue() {+ return (String) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..980a009bc7--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,50 @@+package io.onedev.server.util.input.choiceinput.defaultvalueprovider;++import java.util.List;++import javax.validation.Validator;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.input.choiceprovider.ChoiceProvider;++@Editable(order=100, name="Specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String value;++ @Editable(name="Literal default value")+ @io.onedev.server.util.editable.annotation.ChoiceProvider("getValueChoices")+ @NotEmpty+ @OmitName+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ @Override+ public String getDefaultValue() {+ return getValue();+ }++ @SuppressWarnings("unused")+ private static List<String> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return choiceProvider.getChoices(true);+ else+ return Lists.newArrayList();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/choiceprovider/ChoiceProvider.java b/core/src/main/java/io/onedev/server/util/input/choiceprovider/ChoiceProvider.javanew file mode 100644index 0000000000..4465aae72e--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/choiceprovider/ChoiceProvider.java@@ -0,0 +1,13 @@+package io.onedev.server.util.input.choiceprovider;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface ChoiceProvider extends Serializable {++ List<String> getChoices(boolean allPossible);++}diff --git a/core/src/main/java/io/onedev/server/util/input/choiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/input/choiceprovider/ScriptingChoices.javanew file mode 100644index 0000000000..c27da7c3cc--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/choiceprovider/ScriptingChoices.java@@ -0,0 +1,58 @@+package io.onedev.server.util.input.choiceprovider;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=300, name="Evaluate script to get choices")+public class ScriptingChoices implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);++ private String script;++ @Editable(description="Groovy script to be evaluated. The return value should be a list of string to be used as choices. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<String> getChoices(boolean allPossible) {+ Map<String, Object> variables = new HashMap<>();+ variables.put("allPossible", allPossible);+ try {+ return (List<String>) GroovyUtils.evalScript(getScript(), variables);+ } catch (RuntimeException e) {+ if (allPossible) {+ logger.error("Error getting all possible choices", e);+ return new ArrayList<>();+ } else {+ throw e;+ }+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/choiceprovider/SpecifiedChoices.java b/core/src/main/java/io/onedev/server/util/input/choiceprovider/SpecifiedChoices.javanew file mode 100644index 0000000000..1c8ba6ad1e--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/choiceprovider/SpecifiedChoices.java@@ -0,0 +1,38 @@+package io.onedev.server.util.input.choiceprovider;++import java.util.ArrayList;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.utils.StringUtils;++@Editable(order=100, name="Use specified choices")+public class SpecifiedChoices implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ private String values;++ @Editable(name="Specified choices", description="Specify comma separated choices, for instance: choice1, choice2")+ @NotEmpty+ @OmitName+ public String getValues() {+ return values;+ }++ public void setValues(String values) {+ this.values = values;+ }++ @Override+ public List<String> getChoices(boolean allPossible) {+ if (getValues() != null)+ return StringUtils.splitAndTrim(getValues(), ",");+ else+ return new ArrayList<>();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/dateinput/DateInput.java b/core/src/main/java/io/onedev/server/util/input/dateinput/DateInput.javanew file mode 100644index 0000000000..979ea06872--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/dateinput/DateInput.java@@ -0,0 +1,57 @@+package io.onedev.server.util.input.dateinput;++import java.util.Map;++import org.joda.time.DateTime;++import io.onedev.server.util.Constants;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.dateinput.defaultvalueprovider.DefaultValueProvider;++@Editable(order=505, name=Input.DATE)+public class DateInput extends Input {++ private static final long serialVersionUID = 1L;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "Date");+ appendAnnotations(buffer, index, "NotNull", null, defaultValueProvider!=null);+ appendMethods(buffer, index, "Date", null, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ if (string != null)+ return Constants.DATE_FORMATTER.parseDateTime(string).toDate();+ else+ return null;+ }++ @Override+ public String toString(Object value) {+ if (value != null)+ return Constants.DATE_FORMATTER.print(new DateTime(value));+ else+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..6f333aa6c8--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,13 @@+package io.onedev.server.util.input.dateinput.defaultvalueprovider;++import java.io.Serializable;+import java.util.Date;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ Date getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..0f96617639--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,39 @@+package io.onedev.server.util.input.dateinput.defaultvalueprovider;++import java.util.Date;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return a <i>Date</i> value. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @Override+ public Date getDefaultValue() {+ return (Date) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..a7d0875209--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,33 @@+package io.onedev.server.util.input.dateinput.defaultvalueprovider;++import java.util.Date;++import javax.validation.constraints.NotNull;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;++@Editable(order=100, name="Use specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private Date value;++ @Editable(name="Specified default value")+ @NotNull+ @OmitName+ public Date getValue() {+ return value;+ }++ public void setValue(Date value) {+ this.value = value;+ }++ @Override+ public Date getDefaultValue() {+ return getValue();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/GroupChoiceInput.javanew file mode 100644index 0000000000..6408c6dfe2--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/GroupChoiceInput.java@@ -0,0 +1,79 @@+package io.onedev.server.util.input.groupchoiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.Validator;+import javax.validation.constraints.NotNull;++import io.onedev.server.OneDev;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.input.groupchoiceprovider.AllGroups;+import io.onedev.server.util.input.groupchoiceprovider.ChoiceProvider;++@Editable(order=160, name=Input.GROUP_CHOICE)+public class GroupChoiceInput extends Input {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new AllGroups();++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ List<String> possibleValues = new ArrayList<>();+ if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty()) {+ for (GroupFacade group: getChoiceProvider().getChoices(true))+ possibleValues.add(group.getName());+ }+ return possibleValues;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "String");+ appendAnnotations(buffer, index, "NotEmpty", "GroupChoice", defaultValueProvider!=null);+ appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return string;+ }++ @Override+ public String toString(Object value) {+ return (String) value;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..1c0357f4a9--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input.groupchoiceinput.defaultvalueprovider;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ String getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..a92d8f269b--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,37 @@+package io.onedev.server.util.input.groupchoiceinput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return name of a group. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @Override+ public String getDefaultValue() {+ return (String) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..1212663234--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,52 @@+package io.onedev.server.util.input.groupchoiceinput.defaultvalueprovider;++import java.util.List;++import javax.validation.Validator;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.GroupChoice;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.input.groupchoiceprovider.ChoiceProvider;++@Editable(order=100, name="Specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String value;++ @Editable(name="Literal default value")+ @GroupChoice("getValueChoices")+ @NotEmpty+ @OmitName+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ @Override+ public String getDefaultValue() {+ return getValue();+ }++ @SuppressWarnings("unused")+ private static List<GroupFacade> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return choiceProvider.getChoices(true);+ else+ return Lists.newArrayList();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/AllGroups.java b/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/AllGroups.javanew file mode 100644index 0000000000..c658c6d3f6--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/AllGroups.java@@ -0,0 +1,21 @@+package io.onedev.server.util.input.groupchoiceprovider;++import java.util.ArrayList;+import java.util.List;++import io.onedev.server.OneDev;+import io.onedev.server.manager.CacheManager;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.facade.GroupFacade;++@Editable(order=100, name="All groups")+public class AllGroups implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public List<GroupFacade> getChoices(boolean allPossible) {+ return new ArrayList<>(OneDev.getInstance(CacheManager.class).getGroups().values());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/ChoiceProvider.java b/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/ChoiceProvider.javanew file mode 100644index 0000000000..37a22dbabc--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/ChoiceProvider.java@@ -0,0 +1,14 @@+package io.onedev.server.util.input.groupchoiceprovider;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.facade.GroupFacade;++@Editable+public interface ChoiceProvider extends Serializable {++ List<GroupFacade> getChoices(boolean allPossible);++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/ScriptingChoices.javanew file mode 100644index 0000000000..c6daf8822b--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupchoiceprovider/ScriptingChoices.java@@ -0,0 +1,59 @@+package io.onedev.server.util.input.groupchoiceprovider;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;+import io.onedev.server.util.facade.GroupFacade;++@Editable(order=300, name="Evaluate script to get choices")+public class ScriptingChoices implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);++ private String script;++ @Editable(description="Groovy script to be evaluated. The return value should be a list of group facade object to be used as choices. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<GroupFacade> getChoices(boolean allPossible) {+ Map<String, Object> variables = new HashMap<>();+ variables.put("allPossible", allPossible);+ try {+ return (List<GroupFacade>) GroovyUtils.evalScript(getScript(), variables);+ } catch (RuntimeException e) {+ if (allPossible) {+ logger.error("Error getting all possible choices", e);+ return new ArrayList<>();+ } else {+ throw e;+ }+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/GroupMultiChoiceInput.java b/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/GroupMultiChoiceInput.javanew file mode 100644index 0000000000..6eb6b28f0c--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/GroupMultiChoiceInput.java@@ -0,0 +1,81 @@+package io.onedev.server.util.input.groupmultichoiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.Validator;+import javax.validation.constraints.NotNull;++import io.onedev.server.OneDev;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.groupchoiceprovider.AllGroups;+import io.onedev.server.util.input.groupchoiceprovider.ChoiceProvider;+import io.onedev.server.util.input.groupmultichoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.utils.StringUtils;++@Editable(order=161, name=Input.GROUP_MULTI_CHOICE)+public class GroupMultiChoiceInput extends Input {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new AllGroups();++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ List<String> possibleValues = new ArrayList<>();+ if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty()) {+ for (GroupFacade group: getChoiceProvider().getChoices(true))+ possibleValues.add(group.getName());+ }+ return possibleValues;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "List<String>");+ appendAnnotations(buffer, index, "Size(min=1, max=100)", "GroupChoice", defaultValueProvider!=null);+ appendMethods(buffer, index, "List<String>", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return StringUtils.splitAndTrim(string);+ }++ @SuppressWarnings("unchecked")+ @Override+ public String toString(Object value) {+ return StringUtils.join((List<String>)value);+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..39f4113d79--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,13 @@+package io.onedev.server.util.input.groupmultichoiceinput.defaultvalueprovider;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ List<String> getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..9080c1426a--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,40 @@+package io.onedev.server.util.input.groupmultichoiceinput.defaultvalueprovider;++import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return list of group name. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<String> getDefaultValue() {+ return (List<String>) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..31483f4624--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,52 @@+package io.onedev.server.util.input.groupmultichoiceinput.defaultvalueprovider;++import java.util.List;++import javax.validation.Validator;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.GroupChoice;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.input.groupchoiceprovider.ChoiceProvider;++@Editable(order=100, name="Specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private List<String> value;++ @Editable(name="Literal default value")+ @GroupChoice("getValueChoices")+ @NotEmpty+ @OmitName+ public List<String> getValue() {+ return value;+ }++ public void setValue(List<String> value) {+ this.value = value;+ }++ @Override+ public List<String> getDefaultValue() {+ return getValue();+ }++ @SuppressWarnings("unused")+ private static List<GroupFacade> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return choiceProvider.getChoices(true);+ else+ return Lists.newArrayList();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/multichoiceinput/MultiChoiceInput.java b/core/src/main/java/io/onedev/server/util/input/multichoiceinput/MultiChoiceInput.javanew file mode 100644index 0000000000..39d87861ef--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/multichoiceinput/MultiChoiceInput.java@@ -0,0 +1,78 @@+package io.onedev.server.util.input.multichoiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.Validator;+import javax.validation.constraints.NotNull;++import io.onedev.server.OneDev;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.input.choiceprovider.ChoiceProvider;+import io.onedev.server.util.input.multichoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.utils.StringUtils;++@Editable(order=146, name=Input.MULTI_CHOICE)+public class MultiChoiceInput extends Input {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new SpecifiedChoices();++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty())+ return getChoiceProvider().getChoices(true);+ else+ return new ArrayList<>();+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "List<String>");+ appendAnnotations(buffer, index, "Size(min=1, max=100)", "ChoiceProvider", defaultValueProvider!=null);+ appendMethods(buffer, index, "List<String>", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return StringUtils.split(string);+ }++ @SuppressWarnings("unchecked")+ @Override+ public String toString(Object value) {+ return StringUtils.join((List<String>)value);+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..7bf83c8eb9--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,13 @@+package io.onedev.server.util.input.multichoiceinput.defaultvalueprovider;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ List<String> getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..0eef569a9e--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,40 @@+package io.onedev.server.util.input.multichoiceinput.defaultvalueprovider;++import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return list of string. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<String> getDefaultValue() {+ return (List<String>) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..5ae5ec2bd0--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/multichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,50 @@+package io.onedev.server.util.input.multichoiceinput.defaultvalueprovider;++import java.util.List;++import javax.validation.Validator;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.input.choiceprovider.ChoiceProvider;++@Editable(order=100, name="Specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private List<String> value;++ @Editable(name="Literal default value")+ @io.onedev.server.util.editable.annotation.ChoiceProvider("getValueChoices")+ @NotEmpty+ @OmitName+ public List<String> getValue() {+ return value;+ }++ public void setValue(List<String> value) {+ this.value = value;+ }++ @Override+ public List<String> getDefaultValue() {+ return getValue();+ }++ @SuppressWarnings("unused")+ private static List<String> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return choiceProvider.getChoices(true);+ else+ return Lists.newArrayList();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/numberinput/NumberInput.java b/core/src/main/java/io/onedev/server/util/input/numberinput/NumberInput.javanew file mode 100644index 0000000000..9a1d2ce626--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/numberinput/NumberInput.java@@ -0,0 +1,84 @@+package io.onedev.server.util.input.numberinput;++import java.util.Map;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.numberinput.defaultvalueprovider.DefaultValueProvider;++@Editable(order=400, name=Input.NUMBER)+public class NumberInput extends Input {++ private static final long serialVersionUID = 1L;++ private Integer minValue;++ private Integer maxValue;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, description="Optionally specify the minimum value allowed.")+ public Integer getMinValue() {+ return minValue;+ }++ public void setMinValue(Integer minValue) {+ this.minValue = minValue;+ }++ @Editable(order=1100, description="Optionally specify the maximum value allowed.")+ public Integer getMaxValue() {+ return maxValue;+ }++ public void setMaxValue(Integer maxValue) {+ this.maxValue = maxValue;+ }++ @Editable(order=1200, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "Integer");+ appendAnnotations(buffer, index, "NotNull", null, defaultValueProvider!=null);+ if (minValue != null) {+ if (maxValue != null) {+ buffer.append(" @Range(min=" + minValue.toString() + "L,max=" + maxValue.toString() +"L)\n");+ } else {+ buffer.append(" @Range(min=" + minValue.toString() + "L)\n");+ }+ } else if (maxValue != null) {+ buffer.append(" @Range(max=" + maxValue.toString() + "L)\n");+ }+ appendMethods(buffer, index, "Integer", null, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ if (string != null)+ return Integer.valueOf(string);+ else+ return null;+ }++ @Override+ public String toString(Object value) {+ if (value != null)+ return String.valueOf(value);+ else+ return null;+ }+}diff --git a/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..e52ac2bb4a--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input.numberinput.defaultvalueprovider;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ int getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..1f90129140--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,37 @@+package io.onedev.server.util.input.numberinput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return a <i>Integer</i> value. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @Override+ public int getDefaultValue() {+ return (int) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..64fbcf66f3--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/numberinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,28 @@+package io.onedev.server.util.input.numberinput.defaultvalueprovider;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;++@Editable(order=100, name="Use specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private int value;++ @Editable(name="Specified default value")+ @OmitName+ public int getValue() {+ return value;+ }++ public void setValue(int value) {+ this.value = value;+ }++ @Override+ public int getDefaultValue() {+ return getValue();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/passwordinput/PasswordInput.java b/core/src/main/java/io/onedev/server/util/input/passwordinput/PasswordInput.javanew file mode 100644index 0000000000..fb5c41c2c6--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/passwordinput/PasswordInput.java@@ -0,0 +1,49 @@+package io.onedev.server.util.input.passwordinput;++import java.util.Map;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.passwordinput.defaultvalueprovider.DefaultValueProvider;++@Editable(order=500, name=Input.PASSWORD)+public class PasswordInput extends Input {++ private static final long serialVersionUID = 1L;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "String");+ appendAnnotations(buffer, index, "NotEmpty", null, defaultValueProvider!=null);+ buffer.append(" @Password\n");+ appendMethods(buffer, index, "String", null, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return string;+ }++ @Override+ public String toString(Object value) {+ return (String) value;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..f95db5ec63--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input.passwordinput.defaultvalueprovider;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ String getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..1416ef02ab--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,35 @@+package io.onedev.server.util.input.passwordinput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return a <i>String</i> value. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @Override+ public String getDefaultValue() {+ return (String) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..08fccf9b3c--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/passwordinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,33 @@+package io.onedev.server.util.input.passwordinput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Password;++@Editable(order=100, name="Use specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String value;++ @Editable(name="Specified default value")+ @Password+ @NotEmpty+ @OmitName+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ @Override+ public String getDefaultValue() {+ return getValue();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ShowCondition.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ShowCondition.javanew file mode 100644index 0000000000..ebf145bd1f--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ShowCondition.java@@ -0,0 +1,59 @@+package io.onedev.server.util.input.showcondition;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.validation.constraints.NotNull;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.ChoiceProvider;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.input.Input;++@Editable+public class ShowCondition implements Serializable {++ private static final long serialVersionUID = 1L;++ private String inputName;++ private ValueMatcher valueMatcher = new ValueIsOneOf();++ @Editable(order=100, name="resource.input.whenInput")+ @ChoiceProvider("getNameChoices")+ @NotEmpty+ public String getInputName() {+ return inputName;+ }++ public void setInputName(String inputName) {+ this.inputName = inputName;+ }++ @Editable(order=200)+ @OmitName+ @NotNull+ public ValueMatcher getValueMatcher() {+ return valueMatcher;+ }++ public void setValueMatcher(ValueMatcher valueMatcher) {+ this.valueMatcher = valueMatcher;+ }++ @SuppressWarnings("unused")+ private static List<String> getNameChoices() {+ return new ArrayList<>(OneContext.get().getInputContext().getInputs().keySet());+ }++ public boolean isVisible() {+ Input input = OneContext.get().getInputContext().getInputs().get(getInputName());+ String inputValue = input.toString(OneContext.get().getEditContext().getOnScreenValue(getInputName()));+ return getValueMatcher().matches(inputValue);+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsEmpty.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsEmpty.javanew file mode 100644index 0000000000..025be9d0d5--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsEmpty.java@@ -0,0 +1,15 @@+package io.onedev.server.util.input.showcondition;++import io.onedev.server.util.editable.annotation.Editable;++@Editable(order=400, name="is empty")+public class ValueIsEmpty implements ValueMatcher {++ private static final long serialVersionUID = 1L;++ @Override+ public boolean matches(String value) {+ return value == null;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotAnyOf.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotAnyOf.javanew file mode 100644index 0000000000..0f685c63d5--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotAnyOf.java@@ -0,0 +1,48 @@+package io.onedev.server.util.input.showcondition;++import java.util.List;++import javax.validation.constraints.Size;++import com.google.common.collect.Lists;++import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.ChoiceProvider;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;++@Editable(order=200, name="does not have any value of")+public class ValueIsNotAnyOf implements ValueMatcher {++ private static final long serialVersionUID = 1L;++ private List<String> values;++ @Editable+ @ChoiceProvider("getValueChoices")+ @OmitName+ @Size(min=1, max=100)+ public List<String> getValues() {+ return values;+ }++ public void setValues(List<String> values) {+ this.values = values;+ }++ @SuppressWarnings("unused")+ private static List<String> getValueChoices() {+ // Access on-screen value of ShowCondition.fiedName+ String inputName = (String) OneContext.get().getEditContext(1).getOnScreenValue("inputName");+ if (inputName != null)+ return OneContext.get().getInputContext().getInputs().get(inputName).getPossibleValues();+ else+ return Lists.newArrayList();+ }++ @Override+ public boolean matches(String value) {+ return !getValues().contains(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotEmpty.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotEmpty.javanew file mode 100644index 0000000000..9abbc0db85--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotEmpty.java@@ -0,0 +1,15 @@+package io.onedev.server.util.input.showcondition;++import io.onedev.server.util.editable.annotation.Editable;++@Editable(order=300, name="is not empty")+public class ValueIsNotEmpty implements ValueMatcher {++ private static final long serialVersionUID = 1L;++ @Override+ public boolean matches(String value) {+ return value != null;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsOneOf.javanew file mode 100644index 0000000000..bf835d4408--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsOneOf.java@@ -0,0 +1,48 @@+package io.onedev.server.util.input.showcondition;++import java.util.List;++import javax.validation.constraints.Size;++import com.google.common.collect.Lists;++import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.ChoiceProvider;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;++@Editable(order=100, name="has value of")+public class ValueIsOneOf implements ValueMatcher {++ private static final long serialVersionUID = 1L;++ private List<String> values;++ @Editable+ @ChoiceProvider("getValueChoices")+ @OmitName+ @Size(min=1, max=100)+ public List<String> getValues() {+ return values;+ }++ public void setValues(List<String> values) {+ this.values = values;+ }++ @SuppressWarnings("unused")+ private static List<String> getValueChoices() {+ // Access on-screen value of ShowCondition.fiedName+ String inputName = (String) OneContext.get().getEditContext(1).getOnScreenValue("inputName");+ if (inputName != null)+ return OneContext.get().getInputContext().getInputs().get(inputName).getPossibleValues();+ else+ return Lists.newArrayList();+ }++ @Override+ public boolean matches(String value) {+ return getValues().contains(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueMatcher.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueMatcher.javanew file mode 100644index 0000000000..ef274e8ba3--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueMatcher.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input.showcondition;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface ValueMatcher extends Serializable {++ boolean matches(String value);++}diff --git a/core/src/main/java/io/onedev/server/util/input/textinput/TextInput.java b/core/src/main/java/io/onedev/server/util/input/textinput/TextInput.javanew file mode 100644index 0000000000..4e760d8dba--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/textinput/TextInput.java@@ -0,0 +1,75 @@+package io.onedev.server.util.input.textinput;++import java.util.Map;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.textinput.defaultvalueprovider.DefaultValueProvider;++@Editable(order=100, name=Input.TEXT)+public class TextInput extends Input {++ private static final long serialVersionUID = 1L;++ private boolean multiline;++ private String pattern;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, description="Enable for multi-line input")+ public boolean isMultiline() {+ return multiline;+ }++ public void setMultiline(boolean multiline) {+ this.multiline = multiline;+ }++ @Editable(order=1100, description="Optionally specify a <a href='http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html'>regular expression pattern</a> for valid values of " ++ "the text input")+ public String getPattern() {+ return pattern;+ }++ public void setPattern(String pattern) {+ this.pattern = pattern;+ }++ @Editable(order=1200, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "String");+ appendAnnotations(buffer, index, "NotEmpty", null, defaultValueProvider!=null);+ if (isMultiline())+ buffer.append(" @Multiline\n");+ if (getPattern() != null)+ buffer.append(" @Pattern(regexp=\"" + pattern + "\", message=\"Should match regular expression: " + pattern + "\")\n");+ appendMethods(buffer, index, "String", null, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return string;+ }++ @Override+ public String toString(Object value) {+ return (String) value;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..903c256e73--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input.textinput.defaultvalueprovider;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ String getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..9a77b85332--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,37 @@+package io.onedev.server.util.input.textinput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return a <i>String</i> value. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @Override+ public String getDefaultValue() {+ return (String) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..914a70d8e4--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/textinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,33 @@+package io.onedev.server.util.input.textinput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Password;++@Editable(order=100, name="Use specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String value;++ @Editable(name="Specified default value")+ @Password+ @NotEmpty+ @OmitName+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ @Override+ public String getDefaultValue() {+ return getValue();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/input/userchoiceinput/UserChoiceInput.javanew file mode 100644index 0000000000..25232be9d5--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceinput/UserChoiceInput.java@@ -0,0 +1,79 @@+package io.onedev.server.util.input.userchoiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.Validator;+import javax.validation.constraints.NotNull;++import io.onedev.server.OneDev;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.userchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.input.userchoiceprovider.ChoiceProvider;+import io.onedev.server.util.input.userchoiceprovider.ProjectReaders;++@Editable(order=150, name=Input.USER_CHOICE)+public class UserChoiceInput extends Input {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new ProjectReaders();++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ List<String> possibleValues = new ArrayList<>();+ if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty()) {+ for (UserFacade user: getChoiceProvider().getChoices(true))+ possibleValues.add(user.getName());+ }+ return possibleValues;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "String");+ appendAnnotations(buffer, index, "NotEmpty", "UserChoice", defaultValueProvider!=null);+ appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return string;+ }++ @Override+ public String toString(Object value) {+ return (String) value;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..8fa4f7cb18--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.util.input.userchoiceinput.defaultvalueprovider;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ String getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..c6aa8c3f30--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,37 @@+package io.onedev.server.util.input.userchoiceinput.defaultvalueprovider;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return login name of an user. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @Override+ public String getDefaultValue() {+ return (String) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..3492d53789--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,52 @@+package io.onedev.server.util.input.userchoiceinput.defaultvalueprovider;++import java.util.List;++import javax.validation.Validator;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.UserChoice;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.input.userchoiceprovider.ChoiceProvider;++@Editable(order=100, name="Specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String value;++ @Editable(name="Literal default value")+ @UserChoice("getValueChoices")+ @NotEmpty+ @OmitName+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ @Override+ public String getDefaultValue() {+ return getValue();+ }++ @SuppressWarnings("unused")+ private static List<UserFacade> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return choiceProvider.getChoices(true);+ else+ return Lists.newArrayList();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ChoiceProvider.java b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ChoiceProvider.javanew file mode 100644index 0000000000..cd2809277d--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ChoiceProvider.java@@ -0,0 +1,14 @@+package io.onedev.server.util.input.userchoiceprovider;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.facade.UserFacade;++@Editable+public interface ChoiceProvider extends Serializable {++ List<UserFacade> getChoices(boolean allPossible);++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/GroupUsers.java b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/GroupUsers.javanew file mode 100644index 0000000000..1489cd1bca--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/GroupUsers.java@@ -0,0 +1,47 @@+package io.onedev.server.util.input.userchoiceprovider;++import java.util.ArrayList;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.OneDev;+import io.onedev.server.manager.GroupManager;+import io.onedev.server.model.Group;+import io.onedev.server.model.User;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.GroupChoice;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.facade.UserFacade;++@Editable(order=150, name="Users belonging to group")+public class GroupUsers implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ private String groupName;++ @Editable(name="Group")+ @GroupChoice+ @OmitName+ @NotEmpty+ public String getGroupName() {+ return groupName;+ }++ public void setGroupName(String groupName) {+ this.groupName = groupName;+ }++ @Override+ public List<UserFacade> getChoices(boolean allPossible) {+ List<UserFacade> choices = new ArrayList<>();+ Group group = OneDev.getInstance(GroupManager.class).find(groupName);+ if (group != null) {+ for (User user: group.getMembers())+ choices.add(user.getFacade());+ }+ return choices;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectAdministrators.java b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectAdministrators.javanew file mode 100644index 0000000000..b6c87d0ba4--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectAdministrators.java@@ -0,0 +1,24 @@+package io.onedev.server.util.input.userchoiceprovider;++import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.Project;+import io.onedev.server.security.ProjectPrivilege;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.facade.UserFacade;++@Editable(order=140, name="Users able to administrate the project")+public class ProjectAdministrators implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public List<UserFacade> getChoices(boolean allPossible) {+ Project project = OneContext.get().getProject();+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ADMIN));+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectReaders.java b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectReaders.javanew file mode 100644index 0000000000..9ad634953f--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectReaders.java@@ -0,0 +1,24 @@+package io.onedev.server.util.input.userchoiceprovider;++import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.Project;+import io.onedev.server.security.ProjectPrivilege;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.facade.UserFacade;++@Editable(order=120, name="Users able to access the project")+public class ProjectReaders implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public List<UserFacade> getChoices(boolean allPossible) {+ Project project = OneContext.get().getProject();+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.READ));+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectWriters.java b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectWriters.javanew file mode 100644index 0000000000..ff6d13451a--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ProjectWriters.java@@ -0,0 +1,24 @@+package io.onedev.server.util.input.userchoiceprovider;++import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.Project;+import io.onedev.server.security.ProjectPrivilege;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.facade.UserFacade;++@Editable(order=130, name="Users able to write the project")+public class ProjectWriters implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public List<UserFacade> getChoices(boolean allPossible) {+ Project project = OneContext.get().getProject();+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.WRITE));+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ScriptingChoices.javanew file mode 100644index 0000000000..ac4df7f128--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/userchoiceprovider/ScriptingChoices.java@@ -0,0 +1,59 @@+package io.onedev.server.util.input.userchoiceprovider;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;+import io.onedev.server.util.facade.UserFacade;++@Editable(order=300, name="Evaluate script to get choices")+public class ScriptingChoices implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);++ private String script;++ @Editable(description="Groovy script to be evaluated. The return value should be a list of user facade object to be used as choices. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<UserFacade> getChoices(boolean allPossible) {+ Map<String, Object> variables = new HashMap<>();+ variables.put("allPossible", allPossible);+ try {+ return (List<UserFacade>) GroovyUtils.evalScript(getScript(), variables);+ } catch (RuntimeException e) {+ if (allPossible) {+ logger.error("Error getting all possible choices", e);+ return new ArrayList<>();+ } else {+ throw e;+ }+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/UserMultiChoiceInput.java b/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/UserMultiChoiceInput.javanew file mode 100644index 0000000000..bcf44b66e7--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/UserMultiChoiceInput.java@@ -0,0 +1,81 @@+package io.onedev.server.util.input.usermultichoiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.Validator;+import javax.validation.constraints.NotNull;++import io.onedev.server.OneDev;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.usermultichoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.input.userchoiceprovider.ChoiceProvider;+import io.onedev.server.util.input.userchoiceprovider.ProjectReaders;+import io.onedev.utils.StringUtils;++@Editable(order=151, name=Input.USER_MULTI_CHOICE)+public class UserMultiChoiceInput extends Input {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new ProjectReaders();++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ List<String> possibleValues = new ArrayList<>();+ if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty()) {+ for (UserFacade user: getChoiceProvider().getChoices(true))+ possibleValues.add(user.getName());+ }+ return possibleValues;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ int index = indexes.get(getName());+ StringBuffer buffer = new StringBuffer();+ appendField(buffer, index, "List<String>");+ appendAnnotations(buffer, index, "Size(min=1, max=100)", "UserChoice", defaultValueProvider!=null);+ appendMethods(buffer, index, "List<String>", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ @Override+ public Object toObject(String string) {+ return StringUtils.splitAndTrim(string);+ }++ @SuppressWarnings("unchecked")+ @Override+ public String toString(Object value) {+ return StringUtils.join((List<String>)value);+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/DefaultValueProvider.javanew file mode 100644index 0000000000..c04fc69dbe--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -0,0 +1,13 @@+package io.onedev.server.util.input.usermultichoiceinput.defaultvalueprovider;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.util.editable.annotation.Editable;++@Editable+public interface DefaultValueProvider extends Serializable {++ List<String> getDefaultValue();++}diff --git a/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.javanew file mode 100644index 0000000000..55102bba2d--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -0,0 +1,40 @@+package io.onedev.server.util.input.usermultichoiceinput.defaultvalueprovider;++import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Multiline;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Script;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. It should return list of user login name. "+ + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")+ @NotEmpty+ @Script+ @OmitName+ @Multiline+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<String> getDefaultValue() {+ return (List<String>) GroovyUtils.evalScript(getScript());+ }++}diff --git a/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javanew file mode 100644index 0000000000..4909bf5315--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/input/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -0,0 +1,52 @@+package io.onedev.server.util.input.usermultichoiceinput.defaultvalueprovider;++import java.util.List;++import javax.validation.Validator;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.UserChoice;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.input.userchoiceprovider.ChoiceProvider;++@Editable(order=100, name="Specified default value")+public class SpecifiedDefaultValue implements DefaultValueProvider {++ private static final long serialVersionUID = 1L;++ private List<String> value;++ @Editable(name="Literal default value")+ @UserChoice("getValueChoices")+ @NotEmpty+ @OmitName+ public List<String> getValue() {+ return value;+ }++ public void setValue(List<String> value) {+ this.value = value;+ }++ @Override+ public List<String> getDefaultValue() {+ return getValue();+ }++ @SuppressWarnings("unused")+ private static List<UserFacade> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getOnScreenValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return choiceProvider.getChoices(true);+ else+ return Lists.newArrayList();+ }++}diff --git a/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.javaindex bf9a1b2e4f..4c436e6d19 100644--- a/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java+++ b/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java@@ -20,7 +20,7 @@ import io.onedev.launcher.bootstrap.Bootstrap;import io.onedev.server.git.GitFilter;import io.onedev.server.git.GitPostReceiveCallback;import io.onedev.server.git.GitPreReceiveCallback;-import io.onedev.server.security.OneDevWebEnvironment;+import io.onedev.server.security.OneWebEnvironment;import io.onedev.server.util.jetty.ClasspathAssetServlet;import io.onedev.server.util.jetty.FileAssetServlet;import io.onedev.server.util.jetty.ServletConfigurator;@@ -67,7 +67,7 @@ public class ProductServletConfigurator implements ServletConfigurator {context.getSessionHandler().getSessionManager().setMaxInactiveInterval(serverConfig.getSessionTimeout());- context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, OneDevWebEnvironment.class.getName());+ context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, OneWebEnvironment.class.getName());context.addEventListener(new EnvironmentLoaderListener());FilterHolder shiroFilterHolder = new FilterHolder(shiroFilter);context.addFilter(shiroFilterHolder, "/*", EnumSet.allOf(DispatcherType.class));diff --git a/web/.tern-project b/web/.tern-projectindex b6309dd954..f7f9c08b95 100644--- a/web/.tern-project+++ b/web/.tern-project@@ -11,6 +11,23 @@"plugins": {"guess-types": {+ },+ "browser-extension": {++ },+ "bootstrap": {++ },+ "jquery-ui1-12": {++ },+ "jquery-extension": {+}- }+ },+ "libs": [+ "ecma5",+ "browser",+ "jquery"+ ]}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/web/src/main/java/io/onedev/server/web/DefaultUrlManager.javaindex db0e37b9dc..9b91f36489 100644--- a/web/src/main/java/io/onedev/server/web/DefaultUrlManager.java+++ b/web/src/main/java/io/onedev/server/web/DefaultUrlManager.java@@ -21,7 +21,7 @@ import io.onedev.server.model.PullRequestStatusChange;import io.onedev.server.model.support.CompareContext;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;@Singletonpublic class DefaultUrlManager implements UrlManager {diff --git a/web/src/main/java/io/onedev/server/web/OneDevUrlMapper.java b/web/src/main/java/io/onedev/server/web/OneDevUrlMapper.javadeleted file mode 100644index c487d9e873..0000000000--- a/web/src/main/java/io/onedev/server/web/OneDevUrlMapper.java+++ /dev/null@@ -1,202 +0,0 @@-package io.onedev.server.web;--import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;-import org.apache.wicket.core.request.handler.IPageClassRequestHandler;-import org.apache.wicket.core.request.handler.RenderPageRequestHandler;-import org.apache.wicket.core.request.mapper.ResourceMapper;-import org.apache.wicket.protocol.http.WebApplication;-import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Url;-import org.apache.wicket.request.mapper.CompoundRequestMapper;--import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;-import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;-import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage;-import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;-import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;-import io.onedev.server.web.page.admin.serverlog.ServerLogPage;-import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;-import io.onedev.server.web.page.group.GroupAuthorizationsPage;-import io.onedev.server.web.page.group.GroupListPage;-import io.onedev.server.web.page.group.GroupMembershipsPage;-import io.onedev.server.web.page.group.GroupProfilePage;-import io.onedev.server.web.page.group.NewGroupPage;-import io.onedev.server.web.page.init.ServerInitPage;-import io.onedev.server.web.page.project.NewProjectPage;-import io.onedev.server.web.page.project.NoCommitsPage;-import io.onedev.server.web.page.project.ProjectListPage;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.branches.ProjectBranchesPage;-import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;-import io.onedev.server.web.page.project.commit.ProjectCommitsPage;-import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.pullrequest.InvalidRequestPage;-import io.onedev.server.web.page.project.pullrequest.newrequest.NewRequestPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;-import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage;-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;-import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;-import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;-import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;-import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;-import io.onedev.server.web.page.project.stats.ProjectContribsPage;-import io.onedev.server.web.page.project.stats.SourceLinesPage;-import io.onedev.server.web.page.project.tags.ProjectTagsPage;-import io.onedev.server.web.page.security.ForgetPage;-import io.onedev.server.web.page.security.LoginPage;-import io.onedev.server.web.page.security.LogoutPage;-import io.onedev.server.web.page.security.RegisterPage;-import io.onedev.server.web.page.test.TestPage;-import io.onedev.server.web.page.user.AvatarEditPage;-import io.onedev.server.web.page.user.NewUserPage;-import io.onedev.server.web.page.user.PasswordEditPage;-import io.onedev.server.web.page.user.TaskListPage;-import io.onedev.server.web.page.user.TokenGeneratePage;-import io.onedev.server.web.page.user.UserAuthorizationsPage;-import io.onedev.server.web.page.user.UserListPage;-import io.onedev.server.web.page.user.UserMembershipsPage;-import io.onedev.server.web.page.user.UserProfilePage;-import io.onedev.server.web.util.mapper.OneDevPageMapper;-import io.onedev.server.web.util.mapper.OneDevResourceMapper;-import io.onedev.server.web.util.resource.ArchiveResourceReference;-import io.onedev.server.web.util.resource.AttachmentResourceReference;-import io.onedev.server.web.util.resource.RawBlobResourceReference;-import io.onedev.server.web.util.resource.ServerLogResourceReference;--public class OneDevUrlMapper extends CompoundRequestMapper {-- public OneDevUrlMapper(WebApplication app) {- add(new OneDevPageMapper("init", ServerInitPage.class));- addAdministrationPages();- addUserPages();- addGroupPages();- addProjectPages();- addSecurityPages();-- add(new OneDevPageMapper("test", TestPage.class));-- addResources();- }-- private void addResources() {- add(new ResourceMapper("resource/server-log", new ServerLogResourceReference()));- add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveResourceReference()));- add(new OneDevResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobResourceReference()));- add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}",- new AttachmentResourceReference()));- }-- private void addSecurityPages() {- add(new OneDevPageMapper("login", LoginPage.class));- add(new OneDevPageMapper("logout", LogoutPage.class));- add(new OneDevPageMapper("register", RegisterPage.class));- add(new OneDevPageMapper("forget", ForgetPage.class));- }-- private void addAdministrationPages() {- add(new OneDevPageMapper("administration/settings/system", SystemSettingPage.class));- add(new OneDevPageMapper("administration/settings/mail", MailSettingPage.class));- add(new OneDevPageMapper("administration/settings/backup", DatabaseBackupPage.class));- add(new OneDevPageMapper("administration/settings/security", SecuritySettingPage.class));- add(new OneDevPageMapper("administration/settings/authenticator", AuthenticatorPage.class));- add(new OneDevPageMapper("administration/server-log", ServerLogPage.class));- add(new OneDevPageMapper("administration/server-information", ServerInformationPage.class));- add(new OneDevPageMapper("administration/license-management", LicenseManagementPage.class));- }-- private void addUserPages() {- add(new OneDevPageMapper("users", UserListPage.class));- add(new OneDevPageMapper("users/new", NewUserPage.class));- add(new OneDevPageMapper("users/${user}/profile", UserProfilePage.class));- add(new OneDevPageMapper("users/${user}/groups", UserMembershipsPage.class));- add(new OneDevPageMapper("users/${user}/authorizations", UserAuthorizationsPage.class));- add(new OneDevPageMapper("users/${user}/tasks", TaskListPage.class));- add(new OneDevPageMapper("users/${user}/avatar", AvatarEditPage.class));- add(new OneDevPageMapper("users/${user}/password", PasswordEditPage.class));- add(new OneDevPageMapper("users/${user}/token", TokenGeneratePage.class));- }-- private void addGroupPages() {- add(new OneDevPageMapper("groups", GroupListPage.class));- add(new OneDevPageMapper("groups/new", NewGroupPage.class));- add(new OneDevPageMapper("groups/${group}/profile", GroupProfilePage.class));- add(new OneDevPageMapper("groups/${group}/members", GroupMembershipsPage.class));- add(new OneDevPageMapper("groups/${group}/authorizations", GroupAuthorizationsPage.class));- }-- private void addProjectPages() {- add(new OneDevPageMapper("projects", ProjectListPage.class) {-- /*- * This logic is added to prevent url "/" from being redirected to "/projects"- */- @Override- public Url mapHandler(IRequestHandler requestHandler) {- if (requestHandler instanceof BookmarkablePageRequestHandler- || requestHandler instanceof RenderPageRequestHandler) {- IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;- if (pageClassRequestHandler.getPageClass() == ProjectListPage.class) {- return null;- }- }- return super.mapHandler(requestHandler);- }-- });- add(new OneDevPageMapper("projects/new", NewProjectPage.class));- add(new OneDevPageMapper("projects/${project}", ProjectBlobPage.class));-- add(new OneDevPageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) {-- /*- * This logic is added to prevent url "/projects/<project>" from being redirected to- * "/projects/<project>/blob"- */- @Override- public Url mapHandler(IRequestHandler requestHandler) {- if (requestHandler instanceof BookmarkablePageRequestHandler- || requestHandler instanceof RenderPageRequestHandler) {- IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;- if (pageClassRequestHandler.getPageClass() == ProjectBlobPage.class- && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) {- return null;- }- }- return super.mapHandler(requestHandler);- }-- });- add(new OneDevPageMapper("projects/${project}/commit/${revision}", CommitDetailPage.class));- add(new OneDevPageMapper("projects/${project}/commits", ProjectCommitsPage.class));- add(new OneDevPageMapper("projects/${project}/compare", RevisionComparePage.class));- add(new OneDevPageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));- add(new OneDevPageMapper("projects/${project}/stats/lines", SourceLinesPage.class));-- add(new OneDevPageMapper("projects/${project}/branches", ProjectBranchesPage.class));- add(new OneDevPageMapper("projects/${project}/tags", ProjectTagsPage.class));- add(new OneDevPageMapper("projects/${project}/codecomments", ProjectCodeCommentsPage.class));-- add(new OneDevPageMapper("projects/${project}/pull", RequestListPage.class));- add(new OneDevPageMapper("projects/${project}/pull/new", NewRequestPage.class));- add(new OneDevPageMapper("projects/${project}/pull/${request}", RequestOverviewPage.class));- add(new OneDevPageMapper("projects/${project}/pull/${request}/overview", RequestOverviewPage.class));- add(new OneDevPageMapper("projects/${project}/pull/${request}/code-comments", RequestCodeCommentsPage.class));- add(new OneDevPageMapper("projects/${project}/pull/${request}/changes", RequestChangesPage.class));- add(new OneDevPageMapper("projects/${project}/pull/${request}/merge-preview", MergePreviewPage.class));- add(new OneDevPageMapper("projects/${project}/pull/${request}/invalid", InvalidRequestPage.class));-- add(new OneDevPageMapper("projects/${project}/settings/general", GeneralSettingPage.class));- add(new OneDevPageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));- add(new OneDevPageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));- add(new OneDevPageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));- add(new OneDevPageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));-- add(new OneDevPageMapper("projects/${project}/no-commits", NoCommitsPage.class));- }--}diff --git a/web/src/main/java/io/onedev/server/web/OneUrlMapper.java b/web/src/main/java/io/onedev/server/web/OneUrlMapper.javanew file mode 100644index 0000000000..8c21a757e3--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -0,0 +1,207 @@+package io.onedev.server.web;++import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;+import org.apache.wicket.core.request.mapper.ResourceMapper;+import org.apache.wicket.protocol.http.WebApplication;+import org.apache.wicket.request.IRequestHandler;+import org.apache.wicket.request.Url;+import org.apache.wicket.request.mapper.CompoundRequestMapper;++import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;+import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;+import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage;+import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;+import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;+import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;+import io.onedev.server.web.page.admin.serverlog.ServerLogPage;+import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;+import io.onedev.server.web.page.group.GroupAuthorizationsPage;+import io.onedev.server.web.page.group.GroupListPage;+import io.onedev.server.web.page.group.GroupMembershipsPage;+import io.onedev.server.web.page.group.GroupProfilePage;+import io.onedev.server.web.page.group.NewGroupPage;+import io.onedev.server.web.page.init.ServerInitPage;+import io.onedev.server.web.page.project.NewProjectPage;+import io.onedev.server.web.page.project.NoCommitsPage;+import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.branches.ProjectBranchesPage;+import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;+import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;+import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;+import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.codecomments.RequestCodeCommentsPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.mergepreview.MergePreviewPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;+import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;+import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;+import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;+import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;+import io.onedev.server.web.page.project.setting.issuecustomfields.IssueCustomFieldsPage;+import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;+import io.onedev.server.web.page.project.stats.ProjectContribsPage;+import io.onedev.server.web.page.project.stats.SourceLinesPage;+import io.onedev.server.web.page.project.tags.ProjectTagsPage;+import io.onedev.server.web.page.security.ForgetPage;+import io.onedev.server.web.page.security.LoginPage;+import io.onedev.server.web.page.security.LogoutPage;+import io.onedev.server.web.page.security.RegisterPage;+import io.onedev.server.web.page.test.TestPage;+import io.onedev.server.web.page.user.AvatarEditPage;+import io.onedev.server.web.page.user.NewUserPage;+import io.onedev.server.web.page.user.PasswordEditPage;+import io.onedev.server.web.page.user.TaskListPage;+import io.onedev.server.web.page.user.TokenGeneratePage;+import io.onedev.server.web.page.user.UserAuthorizationsPage;+import io.onedev.server.web.page.user.UserListPage;+import io.onedev.server.web.page.user.UserMembershipsPage;+import io.onedev.server.web.page.user.UserProfilePage;+import io.onedev.server.web.util.mapper.OnePageMapper;+import io.onedev.server.web.util.mapper.OneResourceMapper;+import io.onedev.server.web.util.resource.ArchiveResourceReference;+import io.onedev.server.web.util.resource.AttachmentResourceReference;+import io.onedev.server.web.util.resource.RawBlobResourceReference;+import io.onedev.server.web.util.resource.ServerLogResourceReference;++public class OneUrlMapper extends CompoundRequestMapper {++ public OneUrlMapper(WebApplication app) {+ add(new OnePageMapper("init", ServerInitPage.class));+ addAdministrationPages();+ addUserPages();+ addGroupPages();+ addProjectPages();+ addSecurityPages();++ add(new OnePageMapper("test", TestPage.class));++ addResources();+ }++ private void addResources() {+ add(new ResourceMapper("resource/server-log", new ServerLogResourceReference()));+ add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveResourceReference()));+ add(new OneResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobResourceReference()));+ add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}",+ new AttachmentResourceReference()));+ }++ private void addSecurityPages() {+ add(new OnePageMapper("login", LoginPage.class));+ add(new OnePageMapper("logout", LogoutPage.class));+ add(new OnePageMapper("register", RegisterPage.class));+ add(new OnePageMapper("forget", ForgetPage.class));+ }++ private void addAdministrationPages() {+ add(new OnePageMapper("administration/settings/system", SystemSettingPage.class));+ add(new OnePageMapper("administration/settings/mail", MailSettingPage.class));+ add(new OnePageMapper("administration/settings/backup", DatabaseBackupPage.class));+ add(new OnePageMapper("administration/settings/security", SecuritySettingPage.class));+ add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));+ add(new OnePageMapper("administration/server-log", ServerLogPage.class));+ add(new OnePageMapper("administration/server-information", ServerInformationPage.class));+ add(new OnePageMapper("administration/license-management", LicenseManagementPage.class));+ }++ private void addUserPages() {+ add(new OnePageMapper("users", UserListPage.class));+ add(new OnePageMapper("users/new", NewUserPage.class));+ add(new OnePageMapper("users/${user}/profile", UserProfilePage.class));+ add(new OnePageMapper("users/${user}/groups", UserMembershipsPage.class));+ add(new OnePageMapper("users/${user}/authorizations", UserAuthorizationsPage.class));+ add(new OnePageMapper("users/${user}/tasks", TaskListPage.class));+ add(new OnePageMapper("users/${user}/avatar", AvatarEditPage.class));+ add(new OnePageMapper("users/${user}/password", PasswordEditPage.class));+ add(new OnePageMapper("users/${user}/token", TokenGeneratePage.class));+ }++ private void addGroupPages() {+ add(new OnePageMapper("groups", GroupListPage.class));+ add(new OnePageMapper("groups/new", NewGroupPage.class));+ add(new OnePageMapper("groups/${group}/profile", GroupProfilePage.class));+ add(new OnePageMapper("groups/${group}/members", GroupMembershipsPage.class));+ add(new OnePageMapper("groups/${group}/authorizations", GroupAuthorizationsPage.class));+ }++ private void addProjectPages() {+ add(new OnePageMapper("projects", ProjectListPage.class) {++ /*+ * This logic is added to prevent url "/" from being redirected to "/projects"+ */+ @Override+ public Url mapHandler(IRequestHandler requestHandler) {+ if (requestHandler instanceof BookmarkablePageRequestHandler+ || requestHandler instanceof RenderPageRequestHandler) {+ IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;+ if (pageClassRequestHandler.getPageClass() == ProjectListPage.class) {+ return null;+ }+ }+ return super.mapHandler(requestHandler);+ }++ });+ add(new OnePageMapper("projects/new", NewProjectPage.class));+ add(new OnePageMapper("projects/${project}", ProjectBlobPage.class));++ add(new OnePageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) {++ /*+ * This logic is added to prevent url "/projects/<project>" from being redirected to+ * "/projects/<project>/blob"+ */+ @Override+ public Url mapHandler(IRequestHandler requestHandler) {+ if (requestHandler instanceof BookmarkablePageRequestHandler+ || requestHandler instanceof RenderPageRequestHandler) {+ IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;+ if (pageClassRequestHandler.getPageClass() == ProjectBlobPage.class+ && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) {+ return null;+ }+ }+ return super.mapHandler(requestHandler);+ }++ });+ add(new OnePageMapper("projects/${project}/commits/${revision}", CommitDetailPage.class));+ add(new OnePageMapper("projects/${project}/commits", ProjectCommitsPage.class));+ add(new OnePageMapper("projects/${project}/compare", RevisionComparePage.class));+ add(new OnePageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));+ add(new OnePageMapper("projects/${project}/stats/lines", SourceLinesPage.class));++ add(new OnePageMapper("projects/${project}/branches", ProjectBranchesPage.class));+ add(new OnePageMapper("projects/${project}/tags", ProjectTagsPage.class));+ add(new OnePageMapper("projects/${project}/codecomments", ProjectCodeCommentsPage.class));++ add(new OnePageMapper("projects/${project}/pulls", RequestListPage.class));+ add(new OnePageMapper("projects/${project}/pulls/new", NewRequestPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}", RequestOverviewPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/overview", RequestOverviewPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/code-comments", RequestCodeCommentsPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/changes", RequestChangesPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/invalid", InvalidRequestPage.class));++ add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));++ add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));+ add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));+ add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));+ add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));+ add(new OnePageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));+ add(new OnePageMapper("projects/${project}/settings/issue-custom-fields", IssueCustomFieldsPage.class));++ add(new OnePageMapper("projects/${project}/no-commits", NoCommitsPage.class));+ }++}diff --git a/web/src/main/java/io/onedev/server/web/OneDevWebApplication.java b/web/src/main/java/io/onedev/server/web/OneWebApplication.javasimilarity index 96%rename from web/src/main/java/io/onedev/server/web/OneDevWebApplication.javarename to web/src/main/java/io/onedev/server/web/OneWebApplication.javaindex 2694ea467c..5376b9b705 100644--- a/web/src/main/java/io/onedev/server/web/OneDevWebApplication.java+++ b/web/src/main/java/io/onedev/server/web/OneWebApplication.java@@ -64,7 +64,7 @@ import io.onedev.server.web.websocket.WebSocketManager;import io.onedev.utils.ExceptionUtils;@Singleton-public class OneDevWebApplication extends WebApplication {+public class OneWebApplication extends WebApplication {private final Set<ExpectedExceptionContribution> expectedExceptionContributions;@@ -89,7 +89,7 @@ public class OneDevWebApplication extends WebApplication {BootstrapSettings bootstrapSettings = new BootstrapSettings();bootstrapSettings.setAutoAppendResources(false);de.agilecoders.wicket.core.Bootstrap.install(this, bootstrapSettings);-+getComponentInstantiationListeners().add(new IComponentInstantiationListener() {@Override@@ -179,7 +179,7 @@ public class OneDevWebApplication extends WebApplication {});- mount(new OneDevUrlMapper(this));+ mount(new OneUrlMapper(this));}@Override@@ -212,12 +212,12 @@ public class OneDevWebApplication extends WebApplication {}@Inject- public OneDevWebApplication(Set<ExpectedExceptionContribution> expectedExceptionContributions) {+ public OneWebApplication(Set<ExpectedExceptionContribution> expectedExceptionContributions) {this.expectedExceptionContributions = expectedExceptionContributions;}- public static OneDevWebApplication get() {- return (OneDevWebApplication) Application.get();+ public static OneWebApplication get() {+ return (OneWebApplication) Application.get();}@Overridediff --git a/web/src/main/java/io/onedev/server/web/WebConstants.java b/web/src/main/java/io/onedev/server/web/WebConstants.javaindex 89a047e449..388eba7b88 100644--- a/web/src/main/java/io/onedev/server/web/WebConstants.java+++ b/web/src/main/java/io/onedev/server/web/WebConstants.java@@ -1,16 +1,7 @@package io.onedev.server.web;-import org.joda.time.format.DateTimeFormat;-import org.joda.time.format.DateTimeFormatter;-public class WebConstants {- public static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm";- public static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormat.forPattern(DATETIME_FORMAT);-- public static final String DATE_FORMAT = "yyyy-MM-dd";- public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormat.forPattern(DATE_FORMAT);-public static final int PAGE_SIZE = 25;/* diff constants */diff --git a/web/src/main/java/io/onedev/server/web/WebModule.java b/web/src/main/java/io/onedev/server/web/WebModule.javaindex 7c6b597211..9e652fea37 100644--- a/web/src/main/java/io/onedev/server/web/WebModule.java+++ b/web/src/main/java/io/onedev/server/web/WebModule.java@@ -20,6 +20,7 @@ import com.google.common.collect.Lists;import com.google.common.collect.Sets;import com.vladsch.flexmark.Extension;+import groovy.lang.GroovyRuntimeException;import io.onedev.launcher.loader.AbstractPlugin;import io.onedev.launcher.loader.AbstractPluginModule;import io.onedev.server.git.exception.GitException;@@ -68,8 +69,8 @@ public class WebModule extends AbstractPluginModule {contributeFromPackage(EditSupport.class, EditSupport.class);- bind(WebApplication.class).to(OneDevWebApplication.class);- bind(Application.class).to(OneDevWebApplication.class);+ bind(WebApplication.class).to(OneWebApplication.class);+ bind(Application.class).to(OneWebApplication.class);bind(AvatarManager.class).to(DefaultAvatarManager.class);bind(WebSocketManager.class).to(DefaultWebSocketManager.class);@@ -103,7 +104,7 @@ public class WebModule extends AbstractPluginModule {return Sets.newHashSet(ConstraintViolationException.class, EntityNotFoundException.class,ObjectNotFoundException.class, StaleStateException.class, UnauthorizedException.class,GitException.class, PageExpiredException.class, StalePageException.class,- InvalidReviewRuleException.class);+ InvalidReviewRuleException.class, GroovyRuntimeException.class);}});diff --git a/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.css b/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.cssindex 14d84d9646..fbdde7d865 100644--- a/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.css+++ b/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.css@@ -1,7 +1,7 @@-/*! jQuery UI - v1.12.1 - 2017-03-29+/*! jQuery UI - v1.12.1 - 2018-03-18* http://jqueryui.com-* Includes: draggable.css, core.css, resizable.css, selectable.css, sortable.css, theme.css+* Includes: draggable.css, core.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=base&cornerRadiusShadow=8px&offsetLeftShadow=0px&offsetTopShadow=0px&thicknessShadow=5px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=666666&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=cc0000&fcError=5f3f3f&borderColorError=f1a899&bgTextureError=flat&bgColorError=fddfdf&iconColorHighlight=777620&fcHighlight=777620&borderColorHighlight=dad55e&bgTextureHighlight=flat&bgColorHighlight=fffa90&iconColorActive=ffffff&fcActive=ffffff&borderColorActive=003eff&bgTextureActive=flat&bgColorActive=007fff&iconColorHover=555555&fcHover=2b2b2b&borderColorHover=cccccc&bgTextureHover=flat&bgColorHover=ededed&iconColorDefault=777777&fcDefault=454545&borderColorDefault=c5c5c5&bgTextureDefault=flat&bgColorDefault=f6f6f6&iconColorContent=444444&fcContent=333333&borderColorContent=dddddd&bgTextureContent=flat&bgColorContent=ffffff&iconColorHeader=444444&fcHeader=333333&borderColorHeader=dddddd&bgTextureHeader=flat&bgColorHeader=e9e9e9&cornerRadius=3px&fwDefault=normal&fsDefault=1em&ffDefault=Arial%2CHelvetica%2Csans-serif* Copyright jQuery Foundation and other contributors; Licensed MIT */-.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget.ui-widget-content{border:1px solid #c5c5c5}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.ui-widget-header a{color:#333}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default,.ui-button,html .ui-button.ui-state-disabled:hover,html .ui-button.ui-state-disabled:active{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited,a.ui-button,a:link.ui-button,a:visited.ui-button,.ui-button{color:#454545;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus,.ui-button:hover,.ui-button:focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited,a.ui-button:hover,a.ui-button:focus{color:#2b2b2b;text-decoration:none}.ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active,a.ui-button:active,.ui-button:active,.ui-button.ui-state-active:hover{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.ui-icon-background,.ui-state-active .ui-icon-background{border:#003eff;background-color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.ui-state-checked{border:1px solid #dad55e;background:#fffa90}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#777620}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#5f3f3f}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#5f3f3f}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-button:hover .ui-icon,.ui-button:focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.ui-state-active .ui-icon,.ui-button:active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-highlight .ui-icon,.ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.ui-button .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-caret-1-n{background-position:0 0}.ui-icon-caret-1-ne{background-position:-16px 0}.ui-icon-caret-1-e{background-position:-32px 0}.ui-icon-caret-1-se{background-position:-48px 0}.ui-icon-caret-1-s{background-position:-65px 0}.ui-icon-caret-1-sw{background-position:-80px 0}.ui-icon-caret-1-w{background-position:-96px 0}.ui-icon-caret-1-nw{background-position:-112px 0}.ui-icon-caret-2-n-s{background-position:-128px 0}.ui-icon-caret-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-65px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-65px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:1px -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:3px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:3px}.ui-widget-overlay{background:#aaa;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{-webkit-box-shadow:0 0 5px #666;box-shadow:0 0 5px #666}\ No newline at end of file+.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;font-size:100%}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-button{padding:.4em 1em;display:inline-block;position:relative;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2em;box-sizing:border-box;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-button-icon-only{text-indent:0}.ui-button-icon-only .ui-icon{position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.ui-button.ui-icon-notext .ui-icon{padding:0;width:2.1em;height:2.1em;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-icon-notext .ui-icon{width:auto;height:auto;text-indent:0;white-space:normal;padding:.4em 1em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-controlgroup{vertical-align:middle;display:inline-block}.ui-controlgroup > .ui-controlgroup-item{float:left;margin-left:0;margin-right:0}.ui-controlgroup > .ui-controlgroup-item:focus,.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus{z-index:9999}.ui-controlgroup-vertical > .ui-controlgroup-item{display:block;float:none;width:100%;margin-top:0;margin-bottom:0;text-align:left}.ui-controlgroup-vertical .ui-controlgroup-item{box-sizing:border-box}.ui-controlgroup .ui-controlgroup-label{padding:.4em 1em}.ui-controlgroup .ui-controlgroup-label span{font-size:80%}.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item{border-left:none}.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item{border-top:none}.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content{border-right:none}.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content{border-bottom:none}.ui-controlgroup-vertical .ui-spinner-input{width:75%;width:calc( 100% - 2.4em )}.ui-controlgroup-vertical .ui-spinner .ui-spinner-up{border-top-style:solid}.ui-checkboxradio-label .ui-icon-background{box-shadow:inset 1px 1px 1px #ccc;border-radius:.12em;border:none}.ui-checkboxradio-radio-label .ui-icon-background{width:16px;height:16px;border-radius:1em;overflow:visible;border:none}.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon{background-image:none;width:8px;height:8px;border-width:4px;border-style:solid}.ui-checkboxradio-disabled{pointer-events:none}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-datepicker .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;left:.5em;top:.3em}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-n{height:2px;top:0}.ui-dialog .ui-resizable-e{width:2px;right:0}.ui-dialog .ui-resizable-s{height:2px;bottom:0}.ui-dialog .ui-resizable-w{width:2px;left:0}.ui-dialog .ui-resizable-se,.ui-dialog .ui-resizable-sw,.ui-dialog .ui-resizable-ne,.ui-dialog .ui-resizable-nw{width:7px;height:7px}.ui-dialog .ui-resizable-se{right:0;bottom:0}.ui-dialog .ui-resizable-sw{left:0;bottom:0}.ui-dialog .ui-resizable-ne{right:0;top:0}.ui-dialog .ui-resizable-nw{left:0;top:0}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-text{display:block;margin-right:20px;overflow:hidden;text-overflow:ellipsis}.ui-selectmenu-button.ui-button{text-align:left;white-space:nowrap;width:14em}.ui-selectmenu-icon.ui-icon{float:right;margin-top:0}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:.222em 0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:2em}.ui-spinner-button{width:1.6em;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top-style:none;border-bottom-style:none;border-right-style:none}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget.ui-widget-content{border:1px solid #c5c5c5}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.ui-widget-header a{color:#333}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default,.ui-button,html .ui-button.ui-state-disabled:hover,html .ui-button.ui-state-disabled:active{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited,a.ui-button,a:link.ui-button,a:visited.ui-button,.ui-button{color:#454545;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus,.ui-button:hover,.ui-button:focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited,a.ui-button:hover,a.ui-button:focus{color:#2b2b2b;text-decoration:none}.ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active,a.ui-button:active,.ui-button:active,.ui-button.ui-state-active:hover{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.ui-icon-background,.ui-state-active .ui-icon-background{border:#003eff;background-color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.ui-state-checked{border:1px solid #dad55e;background:#fffa90}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#777620}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#5f3f3f}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#5f3f3f}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-button:hover .ui-icon,.ui-button:focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.ui-state-active .ui-icon,.ui-button:active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-highlight .ui-icon,.ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.ui-button .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-caret-1-n{background-position:0 0}.ui-icon-caret-1-ne{background-position:-16px 0}.ui-icon-caret-1-e{background-position:-32px 0}.ui-icon-caret-1-se{background-position:-48px 0}.ui-icon-caret-1-s{background-position:-65px 0}.ui-icon-caret-1-sw{background-position:-80px 0}.ui-icon-caret-1-w{background-position:-96px 0}.ui-icon-caret-1-nw{background-position:-112px 0}.ui-icon-caret-2-n-s{background-position:-128px 0}.ui-icon-caret-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-65px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-65px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:1px -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:3px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:3px}.ui-widget-overlay{background:#aaa;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{-webkit-box-shadow:0 0 5px #666;box-shadow:0 0 5px #666}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.js b/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.jsindex bd0d89dcab..12cde02d62 100644--- a/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.js+++ b/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.js@@ -1,9 +1,13 @@-/*! jQuery UI - v1.12.1 - 2017-03-29+/*! jQuery UI - v1.12.1 - 2018-03-18* http://jqueryui.com-* Includes: widget.js, data.js, disable-selection.js, keycode.js, scroll-parent.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/mouse.js, effect.js, effects/effect-highlight.js+* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js* Copyright jQuery Foundation and other contributors; Licensed MIT */-(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){t.ui=t.ui||{},t.ui.version="1.12.1";var e=0,i=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][h.toLowerCase()]=function(e){return!!t.data(e,h)},t[l]=t[l]||{},n=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:l,widgetName:e,widgetFullName:h}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var s,n,o=i.call(arguments,1),a=0,r=o.length;r>a;a++)for(s in o[a])n=o[a][s],o[a].hasOwnProperty(s)&&void 0!==n&&(e[s]=t.isPlainObject(n)?t.isPlainObject(e[s])?t.widget.extend({},e[s],n):t.widget.extend({},n):n);return e},t.widget.bridge=function(e,s){var n=s.prototype.widgetFullName||e;t.fn[e]=function(o){var a="string"==typeof o,r=i.call(arguments,1),l=this;return a?this.length||"instance"!==o?this.each(function(){var i,s=t.data(this,n);return"instance"===o?(l=s,!1):s?t.isFunction(s[o])&&"_"!==o.charAt(0)?(i=s[o].apply(s,r),i!==s&&void 0!==i?(l=i&&i.jquery?l.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+o+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+o+"'")}):l=void 0:(r.length&&(o=t.widget.extend.apply(null,[o].concat(r))),this.each(function(){var e=t.data(this,n);e?(e.option(o||{}),e._init&&e._init()):t.data(this,n,new s(o,this))})),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(i,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=e++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),i),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var s=!1;t(document).on("mouseup",function(){s=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!s){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,n=1===e.which,o="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return n&&!o&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),s=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,s=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),l=t.pageX,h=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(l=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(h=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(l=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(h=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,h=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((l-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,l=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(l=this.originalPageX),"x"===a.axis&&(h=this.originalPageY)),{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:l-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,l,h,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)l=s.snapElements[d].left-s.margins.left,h=l+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,l-g>_||m>h+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(l-_),r=g>=Math.abs(h-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(l-m),r=g>=Math.abs(h-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];-this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,o=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&n(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(o=!0,!1):void 0}),o?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var n=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,l=a+e.helperProportions.height,h=i.offset.left,c=i.offset.top,u=h+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=h&&u>=r&&a>=c&&d>=l;case"intersect":return o+e.helperProportions.width/2>h&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>l-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,h,i.proportions().width);case"touch":return(a>=c&&d>=a||l>=c&&d>=l||c>a&&l>d)&&(o>=h&&u>=o||r>=h&&u>=r||h>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&n(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,o,a,r=n(e,this,this.options.tolerance,i),l=!r&&this.isover?"isout":r&&!this.isover?"isover":null;l&&(this.options.greedy&&(o=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===o}),a.length&&(s=t(a[0]).droppable("instance"),s.greedyChild="isover"===l)),s&&"isover"===l&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[l]=!0,this["isout"===l?"isover":"isout"]=!1,this["isover"===l?"_over":"_out"].call(this,i),s&&"isout"===l&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,l=this._change[o];return this._updatePrevProperties(),l?(i=l.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,l,h=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,l=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,h.animate||this.element.css(t.extend(a,{top:l,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!h.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&c&&(t.top=l-e.minHeight),n&&c&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,l={width:i.size.width-r,height:i.size.height-a},h=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(l,c&&h?{top:c,left:h}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,l=t(this).resizable("instance"),h=l.options,c=l.element,u=h.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(l.containerElement=t(d),/document/.test(u)||u===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=l._num(e.css("padding"+s))}),l.containerOffset=e.offset(),l.containerPosition=e.position(),l.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=l.containerOffset,n=l.containerSize.height,o=l.containerSize.width,a=l._hasScroll(d,"left")?d.scrollWidth:o,r=l._hasScroll(d)?d.scrollHeight:n,l.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,l=a.containerOffset,h=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=l),h.left<(a._helper?l.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-l.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?l.left:0),h.top<(a._helper?l.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-l.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?l.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-l.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-l.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),l=a.outerWidth()-e.sizeDiff.width,h=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,l="number"==typeof s.grid?[s.grid,s.grid]:s.grid,h=l[0]||1,c=l[1]||1,u=Math.round((n.width-o.width)/h)*h,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=l,_&&(p+=h),v&&(f+=c),g&&(p-=h),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-h)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-h>0?(i.size.width=p,i.position.left=a.left-u):(p=h-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,l=e.pageY;return o>r&&(i=r,r=o,o=i),a>l&&(i=l,l=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:l-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),h=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?h=!(c.left>r||o>c.right||c.top>l||a>c.bottom):"fit"===n.tolerance&&(h=c.left>o&&r>c.right&&c.top>a&&l>c.bottom),h?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;-this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,l=r+t.height,h=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+h>r&&l>s+h,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&l>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],l=[],h=this._connectWith();if(h&&e)for(s=h.length-1;s>=0;s--)for(o=t(h[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&l.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(l.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=l.length-1;s>=0;s--)l[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,l,h,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,h=r.length;h>s;s++)l=t(r[s]),l.data(this.widgetName+"-item",a),c.push({item:l,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td> </td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,l,h,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(l=this.items[s].item.offset()[a],h=!1,e[u]-l>this.items[s][r]/2&&(h=!0),n>Math.abs(e[u]-l)&&(n=Math.abs(e[u]-l),o=this.items[s],this.direction=h?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,l=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():l?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():l?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}});var o="ui-effects-",a="ui-effects-style",r="ui-effects-animated",l=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=h(),n=s._rgba=[];return i=i.toLowerCase(),f(l,function(t,o){var a,r=o.re.exec(i),l=r&&o.parse(r),h=o.space||"rgba";return l?(a=s[h](l),s[c[h].cache]=a[c[h].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,l=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],h=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=h.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),h.fn=t.extend(h.prototype,{parse:function(n,a,r,l){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,l],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof h?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=h(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=h(t),n=s._space(),o=c[n],a=0===this.alpha()?h("transparent"):this,r=a[o.cache]||o.to(a._rgba),l=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],h=s[o],c=u[n.type]||{};null!==h&&(null===a?l[o]=h:(c.mod&&(h-a>c.mod/2?a+=c.mod:a-h>c.mod/2&&(a-=c.mod)),l[o]=i((h-a)*e+a,n)))}),this[n](l)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=h(e)._rgba;return h(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),h.fn.parse.prototype=h.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),l=Math.min(s,n,o),h=r-l,c=r+l,u=.5*c;return e=l===r?0:s===r?60*(n-o)/h+360:n===r?60*(o-s)/h+120:60*(s-n)/h+240,i=0===h?0:.5>=u?h/c:h/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,l=n.to,c=n.from;h.fn[s]=function(s){if(l&&!this[a]&&(this[a]=l(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=h(c(d)),n[a]=d,n):h(d)},f(o,function(e,i){h.fn[e]||(h.fn[e]=function(n){var o,a=t.type(n),l="alpha"===e?this._hsla?"hsla":"rgba":s,h=this[l](),c=h[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),h[i.idx]=n,this[l](h)))})})}),h.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=h(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(l){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(l){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=h(e.elem,i),e.end=h(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},h.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(l),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(l.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var l=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",h=l.children?a.find("*").addBack():a;h=h.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),h=h.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),h=h.map(function(){var e=this,i=t.Deferred(),s=t.extend({},l,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,h.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),l.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(r)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(o+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(o+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(a,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(a)||"",t.removeData(a)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(o+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=o+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){l.removeData(r),t.effects.cleanUp(l),"hide"===s.mode&&l.hide(),a()-}function a(){t.isFunction(h)&&h.call(l[0]),t.isFunction(e)&&e()}var l=t(this);s.mode=u.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(l[c](),a()):n.call(l[0],s,i):(l.is(":hidden")?"hide"===c:"show"===c)?(l[c](),a()):n.call(l[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,l=a||"fx",h=s.complete,c=s.mode,u=[],d=function(e){var i=t(this),s=t.effects.mode(i,c)||o;i.data(r,!0),u.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?c?this[c](s.duration,h):this.each(function(){h&&h.call(this)}):a===!1?this.each(d).each(i):this.queue(l,d).queue(l,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,l=o?a.scrollLeft():0,h=n.offset(),c={top:h.top-r,left:h.left-l,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-l,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}(),t.effects,t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})})});\ No newline at end of file+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(p.inline?p.dpDiv.parent()[0]:p.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var h=0,l=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},h=e.split(".")[0];e=e.split(".")[1];var l=h+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][l.toLowerCase()]=function(e){return!!t.data(e,l)},t[h]=t[h]||{},n=t[h][e],o=t[h][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:h,widgetName:e,widgetFullName:l}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=l.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=l.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=h++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+o.eventNamespace,c=h[2];c?n.on(l,c,r):i.on(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,h=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):h.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=h.test(i[1])?i[1]:"center",t=l.exec(i[0]),e=l.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,h=t(this),l=h.outerWidth(),c=h.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=l+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),I=e(k.my,h.outerWidth(),h.outerHeight());"right"===n.my[0]?D.left-=l:"center"===n.my[0]&&(D.left-=l/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=I[0],D.top+=I[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:l,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+I[0],u[1]+I[1]],my:n.my,at:n.at,within:b,elem:h})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-l,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:h,left:D.left,top:D.top,width:l,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};l>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),h.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-r-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-r-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}}),t.ui.focusable=function(i,s){var n,o,a,r,h,l=i.nodeName.toLowerCase();return"area"===l?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(l)?(r=!i.disabled,r&&(h=t(i).closest("fieldset")[0],h&&(r=!h.disabled))):r="a"===l?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var c=!1;t(document).on("mouseup",function(){c=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!c){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),c=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,c=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)+},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),h=t.pageX,l=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(h=this.originalPageX),"x"===a.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,h,l,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)h=s.snapElements[d].left-s.margins.left,l=h+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,h-g>_||m>l+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(h-_),r=g>=Math.abs(l-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(h-m),r=g>=Math.abs(l-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&u(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var u=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,h=a+e.helperProportions.height,l=i.offset.left,c=i.offset.top,u=l+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=l&&u>=r&&a>=c&&d>=h;case"intersect":return o+e.helperProportions.width/2>l&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>h-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,l,i.proportions().width);case"touch":return(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d)&&(o>=l&&u>=o||r>=l&&u>=r||l>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&u(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=u(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,h=this._change[o];return this._updatePrevProperties(),h?(i=h.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,h=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,h=this.originalPosition.top+this.originalSize.height,l=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=r-e.minWidth),s&&l&&(t.left=r-e.maxWidth),a&&c&&(t.top=h-e.minHeight),n&&c&&(t.top=h-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,h=t(this).resizable("instance"),l=h.options,c=h.element,u=l.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(h.containerElement=t(d),/document/.test(u)||u===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=h._num(e.css("padding"+s))}),h.containerOffset=e.offset(),h.containerPosition=e.position(),h.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,o=h.containerSize.width,a=h._hasScroll(d,"left")?d.scrollWidth:o,r=h._hasScroll(d)?d.scrollHeight:n,h.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?h.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-h.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-h.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};+t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,c=h[1]||1,u=Math.round((n.width-o.width)/l)*l,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=h,_&&(p+=l),v&&(f+=c),g&&(p-=l),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-l)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-l>0?(i.size.width=p,i.position.left=a.left-u):(p=l-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?l=!(c.left>r||o>c.right||c.top>h||a>c.bottom):"fit"===n.tolerance&&(l=c.left>o&&r>c.right&&c.top>a&&h>c.bottom),l?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td> </td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,h,l,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[a],l=!1,e[u]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(e[u]-h)&&(n=Math.abs(e[u]-h),o=this.items[s],this.direction=l?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t("<span>"),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))+},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],h=r&&n.collapsible,l=h?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:h?t():a,newPanel:l};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=h?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,h=t.css("box-sizing"),l=t.length&&(!e.length||t.index()<e.index()),c=this.options.animate||{},u=l&&c.down||c,d=function(){a._toggleComplete(i)};return"number"==typeof u&&(o=u),"string"==typeof u&&(n=u),n=n||u.easing||c.easing,o=o||u.duration||c.duration,e.length?t.length?(s=t.show().outerHeight(),e.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(this.showProps,{duration:o,easing:n,complete:d,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==a.options.heightStyle&&(i.now=Math.round(s-e.outerHeight()-r),r=0)}}),void 0):e.animate(this.hideProps,o,n,d):t.animate(this.showProps,o,n,d)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,h=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=h.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=h.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete;var d=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var h=n[s]("widget");t.data(h[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(h[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var o=i.options.classes[n]||"";o=t.trim(o.replace(d,"")),s[n]=(o+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)+},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.extend(t.ui,{datepicker:{version:"1.12.1"}});var p;t.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return a(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var s=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?n(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(i),t.data(e,"datepicker",i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.off("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.on("focus",this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.on("click",function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,n,o){var r,h,l,c,u,d=this._dialogInst;return d||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),t("body").append(this._dialogInput),d=this._dialogInst=this._newInst(this._dialogInput,!1),d.settings={},t.data(this._dialogInput[0],"datepicker",d)),a(d.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(d,i):i,this._dialogInput.val(i),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,u=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+c,l/2-150+u]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),d.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],"datepicker",d),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,"datepicker");s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),p===n&&(p=null))},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,i,s){var n,o,r,h,l=this._getInst(e);return 2===arguments.length&&"string"==typeof i?"defaults"===i?t.extend({},t.datepicker._defaults):l?"all"===i?t.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),o=this._getDateDatepicker(e,!0),r=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),a(l.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,r)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(e):this._enableDatepicker(e)),this._attachments(t(e),l),this._autoSize(l),this._setDate(l,o),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var i,s,n=t.datepicker._getInst(e.target);return t.datepicker._get(n,"constrainInput")?(i=t.datepicker._possibleChars(t.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),e.ctrlKey||e.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var s,n,o,r,h,l,c;s=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==s&&(t.datepicker._curInst.dpDiv.stop(!0,!0),s&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),n=t.datepicker._get(s,"beforeShow"),o=n?n.apply(e,[e,s]):{},o!==!1&&(a(s.settings,o),s.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(s),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),r=!1,t(e).parents().each(function(){return r|="fixed"===t(this).css("position"),!r}),h={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,s.dpDiv.empty(),s.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(s),h=t.datepicker._checkOffset(s,h,r),s.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":r?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),s.inline||(l=t.datepicker._get(s,"showAnim"),c=t.datepicker._get(s,"duration"),s.dpDiv.css("z-index",i(t(e))+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[l]?s.dpDiv.show(l,t.datepicker._get(s,"showOptions"),c):s.dpDiv[l||"show"](l?c:null),t.datepicker._shouldFocusInput(s)&&s.input.trigger("focus"),t.datepicker._curInst=s))}},_updateDatepicker:function(e){this.maxRows=4,p=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var i,s=this._getNumberOfMonths(e),n=s[1],a=17,r=e.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.trigger("focus"),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,a=this._curInst;!a||e&&a!==t.data(e,"datepicker")||this._datepickerShowing&&(i=this._get(a,"showAnim"),s=this._get(a,"duration"),n=function(){t.datepicker._tidyDialog(a)},t.effects&&(t.effects.effect[i]||t.effects[i])?a.dpDiv.hide(i,t.datepicker._get(a,"showOptions"),s,n):a.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(a,"onClose"),o&&o.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).val(n))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(e,i,s){if(null==e||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,o,a,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,c="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),u=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,d=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,g=-1,m=-1,_=-1,v=-1,b=!1,y=function(t){var i=e.length>n+1&&e.charAt(n+1)===t;return i&&n++,i},w=function(t){var e=y(t),s="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n="y"===t?s:1,o=RegExp("^\\d{"+n+","+s+"}"),a=i.substring(h).match(o);if(!a)throw"Missing number at position "+h;return h+=a[0].length,parseInt(a[0],10)},k=function(e,s,n){var o=-1,a=t.map(y(e)?n:s,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(a,function(t,e){var s=e[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(o=e[0],h+=s.length,!1):void 0}),-1!==o)return o+1;throw"Unknown name at position "+h},x=function(){if(i.charAt(h)!==e.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;e.length>n;n++)if(b)"'"!==e.charAt(n)||y("'")?x():b=!1;else switch(e.charAt(n)){case"d":_=w("d");break;case"D":k("D",u,d);break;case"o":v=w("o");break;case"m":m=w("m");break;case"M":m=k("M",p,f);break;case"y":g=w("y");break;case"@":r=new Date(w("@")),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"!":r=new Date((w("!")-this._ticksTo1970)/1e4),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"'":y("'")?x():b=!0;break;default:x()}if(i.length>h&&(a=i.substr(h),!/^\s+/.test(a)))throw"Extra/unparsed characters found in date: "+a;if(-1===g?g=(new Date).getFullYear():100>g&&(g+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c>=g?0:-100)),v>-1)for(m=1,_=v;;){if(o=this._getDaysInMonth(g,m-1),o>=_)break;m++,_-=o}if(r=this._daylightSavingAdjust(new Date(g,m-1,_)),r.getFullYear()!==g||r.getMonth()+1!==m||r.getDate()!==_)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getFullYear()%100?"0":"")+e.getFullYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,e){return void 0!==t.settings[e]?t.settings[e]:this._defaults[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).on(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,_,v,b,y,w,k,x,C,D,I,T,P,M,S,H,z,O,A,N,W,E,F,L,R=new Date,B=this._daylightSavingAdjust(new Date(R.getFullYear(),R.getMonth(),R.getDate())),Y=this._get(t,"isRTL"),j=this._get(t,"showButtonPanel"),q=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),V=this._get(t,"showCurrentAtPos"),$=this._get(t,"stepMonths"),X=1!==U[0]||1!==U[1],G=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),Q=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-V,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-U[0]*U[1]+1,J.getDate())),e=Q&&Q>e?Q:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-$,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":q?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+$,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":q?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?G:B,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=j?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),_=this._get(t,"showOtherMonths"),v=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,C=0;U[1]>C;C++){if(D=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",T="",X){if(T+="<div class='ui-datepicker-group",U[1]>1)switch(C){case 0:T+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");+break;case U[1]-1:T+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:T+=" ui-datepicker-group-middle",I=""}T+="'>"}for(T+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===k?Y?o:s:"")+(/all|right/.test(I)&&0===k?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,Q,J,k>0||C>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",P=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,P+="<th scope='col'"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(T+=P+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),H=(this._getFirstDayOfMonth(te,Z)-c+7)%7,z=Math.ceil((H+S)/7),O=X?this.maxRows>z?this.maxRows:z:z,this.maxRows=O,A=this._daylightSavingAdjust(new Date(te,Z,1-H)),N=0;O>N;N++){for(T+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(A)+"</td>":"",w=0;7>w;w++)E=m?m.apply(t.input?t.input[0]:null,[A]):[!0,""],F=A.getMonth()!==Z,L=F&&!v||!E[0]||Q&&Q>A||J&&A>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(A.getTime()===D.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===A.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!_?"":" "+E[1]+(A.getTime()===G.getTime()?" "+this._currentClass:"")+(A.getTime()===B.getTime()?" ui-datepicker-today":""))+"'"+(F&&!_||!E[2]?"":" title='"+E[2].replace(/'/g,"'")+"'")+(L?"":" data-handler='selectDay' data-event='click' data-month='"+A.getMonth()+"' data-year='"+A.getFullYear()+"'")+">"+(F&&!_?" ":L?"<span class='ui-state-default'>"+A.getDate()+"</span>":"<a class='ui-state-default"+(A.getTime()===B.getTime()?" ui-state-highlight":"")+(A.getTime()===G.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+A.getDate()+"</a>")+"</td>",A.setDate(A.getDate()+1),A=this._daylightSavingAdjust(A);T+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),T+="</tbody></table>"+(X?"</div>"+(U[0]>0&&C===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=T}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),_=this._get(t,"changeYear"),v=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(v||(b+=y+(!o&&m&&_?"":" ")),!t.yearshtml)if(t.yearshtml="",o||!_)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),v&&(b+=(!o&&m&&_?"":" ")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).on("mousedown",t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new s,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.12.1",t.datepicker,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html(" ")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),h=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html(" ")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)+},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),h=t(s).closest("li"),l=h.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=h.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},h=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),h(n,e)},1)}).fail(function(t,e){setTimeout(function(){h(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){l.of=t,a.is(":hidden")||a.position(l)}var o,a,r,h,l=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),h=t("<div>").html(a.find(".ui-tooltip-content").html()),h.removeAttr("name").find("[name]").removeAttr("name"),h.removeAttr("id").find("[id]").removeAttr("id"),h.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]+}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip;var f="ui-effects-",g="ui-effects-style",m="ui-effects-animated",_=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(_),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(_.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),l=l.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(m)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(f+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(f+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(g,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(g)||"",t.removeData(g)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(f+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=f+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(m),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(h)&&h.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[l](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===l:"show"===l)?(r[l](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",h=s.complete,l=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,l)||o;i.data(m,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?l?this[l](s.duration,h):this.each(function(){h&&h.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var v=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},h=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),h&&h.css(t.effects.clipToBox(r)),r.clip=a),h&&h.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,h="hide"===r,l="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(l||h?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),l&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),h&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=h?2*u:u/2;h&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,h=r||"horizontal"===a,l=r||"vertical"===a;s=o.cssClip(),n.clip={top:l?(s.bottom-s.top)/2:s.top,right:h?(s.right-s.left)/2:s.right,bottom:l?(s.bottom-s.top)/2:s.bottom,left:h?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",h="up"===r||"down"===r?"top":"left",l="up"===r||"left"===r?"-=":"+=",c="+="===l?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===h?"outerHeight":"outerWidth"](!0)/2,u[h]=l+s,a&&(n.css(u),u[h]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?l*_:0),top:h+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:l*_),top:h+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,h=/([0-9]+)%/.exec(r),l=!!e.horizFirst,c=l?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;h&&(r=parseInt(h[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],l=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,h,n.from.y,_),v=t.effects.setTransition(a,h,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,l,n.from.x,_),v=t.effects.setTransition(a,l,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(h=h.concat(["marginTop","marginBottom"]).concat(r),l=l.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,h,n.from.y,o),a=t.effects.setTransition(i,h,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,l,n.from.x,o),a=t.effects.setTransition(i,l,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,h=2*(e.times||5)+(r?1:0),l=e.duration/h,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);h>u;u++)s.animate({opacity:c},l,e.easing),c=1-c;s.animate({opacity:c},l,e.easing),s.queue(i),t.effects.unshift(s,d,h+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,h=2*r+1,l=Math.round(e.duration/h),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,l,e.easing);r>s;s++)n.animate(p,l,e.easing).animate(f,l,e.easing);n.animate(p,l,e.easing).animate(d,l/2,e.easing).queue(i),t.effects.unshift(n,g,h+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u=e.distance||o["top"===l?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[l],d[l]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[h][1]]=d.clip[a[h][0]],"show"===r&&(o.cssClip(d.clip),o.css(l,d[l]),d.clip=s,d[l]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var v;t.uiBackCompat!==!1&&(v=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)}))});\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/behavior/DisplayNoneBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/DisplayNoneBehavior.javanew file mode 100644index 0000000000..f06b8e86f1--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/behavior/DisplayNoneBehavior.java@@ -0,0 +1,19 @@+package io.onedev.server.web.behavior;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.model.Model;++@SuppressWarnings("serial")+public class DisplayNoneBehavior extends AttributeAppender {++ public DisplayNoneBehavior() {+ super("style", Model.of("display:none"));+ }++ @Override+ public boolean isTemporary(Component component) {+ return true;+ }++}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.java b/web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.javaindex 181fb78385..cc10ae9211 100644--- a/web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.java+++ b/web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.java@@ -11,6 +11,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.Alignment;import io.onedev.server.web.component.floating.ComponentTarget;import io.onedev.server.web.component.floating.FloatingPanel;@@ -56,7 +57,7 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior {@Overrideprotected void respond(AjaxRequestTarget target) {if (dropdown == null) {- dropdown = new FloatingPanel(target, new ComponentTarget(alignTarget!=null?alignTarget:getComponent()), placement) {+ dropdown = new FloatingPanel(target, new Alignment(new ComponentTarget(alignTarget!=null?alignTarget:getComponent()), placement)) {@Overrideprotected void onInitialize() {diff --git a/web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.javaindex 880bf4a911..c142f94863 100644--- a/web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java+++ b/web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java@@ -26,6 +26,7 @@ import io.onedev.launcher.loader.AppLoader;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.AlignTarget;+import io.onedev.server.web.component.floating.Alignment;import io.onedev.server.web.component.floating.ComponentTarget;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.utils.Range;@@ -148,7 +149,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {if (!suggestions.isEmpty()) {int anchor = getAnchor(inputContent.substring(0, inputCaret));if (dropdown == null) {- dropdown = new FloatingPanel(target, new ComponentTarget(getComponent(), anchor), AlignPlacement.bottom(0)) {+ dropdown = new FloatingPanel(target, new Alignment(new ComponentTarget(getComponent(), anchor), AlignPlacement.bottom(0))) {@Overrideprotected Component newContent(String id) {diff --git a/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.javaindex aa2cb1f532..53a903b965 100644--- a/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java+++ b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java@@ -54,7 +54,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.PagingHistorySupport;diff --git a/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.javaindex 419d9f8f36..a55169363b 100644--- a/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java+++ b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java@@ -55,7 +55,7 @@ import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;diff --git a/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java b/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.javaindex 68cf40e90e..030246c30a 100644--- a/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java+++ b/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java@@ -31,6 +31,7 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.manager.VerificationManager;import io.onedev.server.model.Project;+import io.onedev.server.util.Constants;import io.onedev.server.util.Verification;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;@@ -42,7 +43,7 @@ import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.verification.VerificationStatusPanel;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.model.CommitRefsModel;@SuppressWarnings("serial")@@ -176,7 +177,7 @@ public class CommitListPanel extends Panel {} else {fragment = new Fragment("commit", "dateFrag", CommitListPanel.this);DateTime dateTime = new DateTime(getModelObject().get(item.getIndex()+1).getCommitterIdent().getWhen());- fragment.add(new Label("date", WebConstants.DATE_FORMATTER.print(dateTime)));+ fragment.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));if (item.getIndex() == 0)item.add(AttributeAppender.append("class", "date first"));elsediff --git a/web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java b/web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.javaindex b8cdca12fb..64ec6fd702 100644--- a/web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java+++ b/web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java@@ -19,7 +19,7 @@ import org.unbescape.html.HtmlEscape;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.utils.Highlighter;import io.onedev.utils.Transformer;diff --git a/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.javaindex 0c7bbd85b9..36d0453577 100644--- a/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java@@ -73,9 +73,9 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.page.project.commit.CommitDetailPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.mergepreview.MergePreviewPage;import io.onedev.server.web.util.DateUtils;import io.onedev.utils.Range;import io.onedev.utils.RangeUtils;diff --git a/web/src/main/java/io/onedev/server/web/component/floating/Alignment.java b/web/src/main/java/io/onedev/server/web/component/floating/Alignment.javanew file mode 100644index 0000000000..bd3efa37d2--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/component/floating/Alignment.java@@ -0,0 +1,26 @@+package io.onedev.server.web.component.floating;++import java.io.Serializable;++public class Alignment implements Serializable {++ private static final long serialVersionUID = 1L;++ private final AlignTarget target;++ private final AlignPlacement placement;++ public Alignment(AlignTarget target, AlignPlacement placement) {+ this.target = target;+ this.placement = placement;+ }++ public AlignTarget getTarget() {+ return target;+ }++ public AlignPlacement getPlacement() {+ return placement;+ }++}diff --git a/web/src/main/java/io/onedev/server/web/component/floating/ComponentTarget.java b/web/src/main/java/io/onedev/server/web/component/floating/ComponentTarget.javaindex 810c148488..fa201a11de 100644--- a/web/src/main/java/io/onedev/server/web/component/floating/ComponentTarget.java+++ b/web/src/main/java/io/onedev/server/web/component/floating/ComponentTarget.java@@ -24,7 +24,7 @@ public class ComponentTarget implements AlignTarget {@Overridepublic String toString() {return String.format("{element: document.getElementById('%s'), index: %s}",- component.getMarkupId(), index!=-1?index:"undefined");+ component.getMarkupId(true), index!=-1?index:"undefined");}}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java b/web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.javaindex 0c466df73e..345737c5aa 100644--- a/web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java+++ b/web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.floating;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;@@ -10,29 +12,48 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.behavior.DisplayNoneBehavior;import io.onedev.server.web.page.base.BasePage;+import io.onedev.server.web.util.Animation;@SuppressWarnings("serial")public abstract class FloatingPanel extends Panel {private static final String CONTENT_ID = "content";- private final AlignTarget alignTarget;+ private final Alignment alignment;- private final AlignPlacement placement;+ private final Animation animation;- public FloatingPanel(AjaxRequestTarget target, AlignTarget alignTarget, AlignPlacement placement) {+ public FloatingPanel(AjaxRequestTarget target, @Nullable Alignment alignment,+ @Nullable Animation animation) {super(((BasePage)target.getPage()).getRootComponents().newChildId());+ this.alignment = alignment;+ this.animation = animation;+BasePage page = (BasePage) target.getPage();page.getRootComponents().add(this);- target.prependJavaScript(String.format("$('body').append(\"<div id='%s'></div>\");", getMarkupId()));++ String script = String.format("$('body').append(\"<div id='%s'></div>\");",+ getMarkupId());+ target.prependJavaScript(script);++ if (animation != null)+ add(new DisplayNoneBehavior());target.add(this);- this.alignTarget = alignTarget;- this.placement = placement;+ if (animation != null) {+ script = String.format("$('#%s').show('slide', {direction: '%s'}, 200);",+ getMarkupId(true), animation.name().toLowerCase());+ target.appendJavaScript(script);+ }}+ public FloatingPanel(AjaxRequestTarget target, @Nullable Alignment alignment) {+ this(target, alignment, null);+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -53,8 +74,17 @@ public abstract class FloatingPanel extends Panel {response.render(JavaScriptHeaderItem.forReference(new FloatingResourceReference()));- String script = String.format("onedev.server.floating.init('%s', {target:%s, placement:%s}, %s);",- getMarkupId(true), alignTarget, placement, getCallbackFunction());+ String jsonOfAlignment;+ if (alignment != null) {+ jsonOfAlignment = String.format("{target:%s, placement:%s}",+ alignment.getTarget(), alignment.getPlacement());+ } else {+ jsonOfAlignment = "undefined";+ }+ String script = String.format("onedev.server.floating.init('%s', %s, %s, %s);",+ getMarkupId(true), jsonOfAlignment,+ animation!=null?"'" + animation + "'":"undefined",+ getCallbackFunction());response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/web/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java b/web/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.javaindex 9a90a5dcaf..b0b29641a8 100644--- a/web/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java@@ -4,8 +4,10 @@ import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;+import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;public class FloatingResourceReference extends BaseDependentResourceReference {@@ -19,6 +21,7 @@ public class FloatingResourceReference extends BaseDependentResourceReference {@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(FloatingResourceReference.class, "floating.css")));return dependencies;}diff --git a/web/src/main/java/io/onedev/server/web/component/floating/floating.js b/web/src/main/java/io/onedev/server/web/component/floating/floating.jsindex 21f2ac4edb..7e42b8b45a 100644--- a/web/src/main/java/io/onedev/server/web/component/floating/floating.js+++ b/web/src/main/java/io/onedev/server/web/component/floating/floating.js@@ -1,7 +1,8 @@onedev.server.floating = {- init: function(floatingId, alignment, closeCallback) {+ init: function(floatingId, alignment, animation, closeCallback) {var $floating = $("#" + floatingId);$floating.data("closeCallback", closeCallback);+ $floating.data("animation", animation);$floating.data("mouseUpOrTouchStart", function(e) {/*@@ -34,15 +35,17 @@ onedev.server.floating = {// use keydown as keypress does not work in chrome/safari$(document).on("keydown", $floating.data("keydown"));-- if (alignment.target.element)- $(alignment.target.element).addClass("floating-aligned");-- $floating.data("alignment", alignment);++ if (alignment) {+ if (alignment.target.element)+ $(alignment.target.element).addClass("floating-aligned");+ $floating.data("alignment", alignment);+ }var openTriggered = false;$floating.data("elementReplaced", function() {- $floating.align($floating.data("alignment"));+ if ($floating.data("alignment"))+ $floating.align($floating.data("alignment"));if (!openTriggered) {$floating.trigger("open");openTriggered = true;@@ -58,7 +61,7 @@ onedev.server.floating = {var alignment = $floating.data("alignment");- if (alignment.target.element)+ if (alignment && alignment.target.element)$(alignment.target.element).removeClass("floating-aligned");$(document).off("mouseup touchstart", $floating.data("mouseUpOrTouchStart"));@@ -67,7 +70,14 @@ onedev.server.floating = {$floating.trigger("close");- $floating.remove();+ var animation = $floating.data("animation");+ if (animation) {+ $floating.hide("slide", {direction: animation.toLowerCase()}, 200, function() {+ $floating.remove();+ });+ } else {+ $floating.remove();+ }}}diff --git a/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.javaindex 24f7d6202b..74ee5beda6 100644--- a/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java+++ b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java@@ -4,8 +4,6 @@ import java.util.ArrayList;import java.util.Comparator;import java.util.List;-import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.select2.Response;@@ -17,14 +15,16 @@ public class GroupChoiceProvider extends AbstractGroupChoiceProvider {private static final long serialVersionUID = 1L;+ private final List<GroupFacade> choices;++ public GroupChoiceProvider(List<GroupFacade> choices) {+ this.choices = new ArrayList<>(choices);+ this.choices.sort(Comparator.comparing(GroupFacade::getName));+ }+@Overridepublic void query(String term, int page, Response<GroupFacade> response) {- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- List<GroupFacade> choices = new ArrayList<GroupFacade>(cacheManager.getGroups().values());-- choices.sort(Comparator.comparing(GroupFacade::getName));-- choices = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<GroupFacade>() {+ List<GroupFacade> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<GroupFacade>() {@Overridepublic double getMatchScore(GroupFacade object) {@@ -33,7 +33,7 @@ public class GroupChoiceProvider extends AbstractGroupChoiceProvider {});- new ResponseFiller<GroupFacade>(response).fill(choices, page, WebConstants.PAGE_SIZE);+ new ResponseFiller<GroupFacade>(response).fill(matched, page, WebConstants.PAGE_SIZE);}}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/component/link/DropdownLink.java b/web/src/main/java/io/onedev/server/web/component/link/DropdownLink.javaindex 6ccab488f6..99f2bba2ed 100644--- a/web/src/main/java/io/onedev/server/web/component/link/DropdownLink.java+++ b/web/src/main/java/io/onedev/server/web/component/link/DropdownLink.java@@ -12,6 +12,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.AlignTarget;+import io.onedev.server.web.component.floating.Alignment;import io.onedev.server.web.component.floating.ComponentTarget;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.floating.RectTarget;@@ -84,7 +85,7 @@ public abstract class DropdownLink extends AjaxLink<Void> {alignFloatingWith = new ComponentTarget(this);}- dropdown = new FloatingPanel(target, alignFloatingWith, placement) {+ dropdown = new FloatingPanel(target, new Alignment(alignFloatingWith, placement)) {@Overrideprotected void onInitialize() {diff --git a/web/src/main/java/io/onedev/server/web/component/modal/ModalLink.java b/web/src/main/java/io/onedev/server/web/component/modal/ModalLink.javaindex c069db70ab..e10a1660a1 100644--- a/web/src/main/java/io/onedev/server/web/component/modal/ModalLink.java+++ b/web/src/main/java/io/onedev/server/web/component/modal/ModalLink.java@@ -9,16 +9,23 @@ public abstract class ModalLink extends AjaxLink<Void> {private ModalPanel modal;- public ModalLink(String id) {+ private final ModalPanel.Size size;++ public ModalLink(String id, ModalPanel.Size size) {super(id);+ this.size = size;}+ public ModalLink(String id) {+ this(id, ModalPanel.Size.MEDIUM);+ }+@Overridepublic void onClick(AjaxRequestTarget target) {// if modal has not been created, or has been removed from page// when the same page instance is refreshedif (modal == null || modal.getParent() == null) {- modal = new ModalPanel(target) {+ modal = new ModalPanel(target, size) {@Overrideprotected Component newContent(String id) {diff --git a/web/src/main/java/io/onedev/server/web/component/modal/modal.js b/web/src/main/java/io/onedev/server/web/component/modal/modal.jsindex 00fc47c3e2..f74eea1157 100644--- a/web/src/main/java/io/onedev/server/web/component/modal/modal.js+++ b/web/src/main/java/io/onedev/server/web/component/modal/modal.js@@ -9,7 +9,13 @@ onedev.server.modal = {&& $("body>.floating").length == 0&& $(".atwho-view:visible").length == 0&& $modal.nextAll(".modal").length == 0) {- onedev.server.modal.close($modal, true);+ if ($modal.find(".leave-confirm.dirty").length != 0) {+ if (confirm("There are unsaved changes, do you want to close?")) {+ onedev.server.modal.close($modal, true);+ }+ } else {+ onedev.server.modal.close($modal, true);+ }}});diff --git a/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java b/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.javaindex 8f17fadb57..b6328b1c64 100644--- a/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java+++ b/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java@@ -37,7 +37,7 @@ import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.PagingHistorySupport;diff --git a/web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.html b/web/src/main/java/io/onedev/server/web/component/sidebar/SideBar.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.htmlrename to web/src/main/java/io/onedev/server/web/component/sidebar/SideBar.htmldiff --git a/web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.java b/web/src/main/java/io/onedev/server/web/component/sidebar/SideBar.javasimilarity index 94%rename from web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.javarename to web/src/main/java/io/onedev/server/web/component/sidebar/SideBar.javaindex 0f9148c448..920f325f14 100644--- a/web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.java+++ b/web/src/main/java/io/onedev/server/web/component/sidebar/SideBar.java@@ -20,11 +20,11 @@ import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.util.WicketUtils;@SuppressWarnings("serial")-public abstract class SidebarPanel extends Panel {+public abstract class SideBar extends Panel {private final String miniCookieKey;- public SidebarPanel(String id, @Nullable String miniCookieKey) {+ public SideBar(String id, @Nullable String miniCookieKey) {super(id);this.miniCookieKey = miniCookieKey;}diff --git a/web/src/main/java/io/onedev/server/web/component/userchoice/UserChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/userchoice/UserChoiceProvider.javaindex 3884d9704d..0c010641bb 100644--- a/web/src/main/java/io/onedev/server/web/component/userchoice/UserChoiceProvider.java+++ b/web/src/main/java/io/onedev/server/web/component/userchoice/UserChoiceProvider.java@@ -4,18 +4,10 @@ import java.util.ArrayList;import java.util.Comparator;import java.util.List;-import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.security.ProjectPrivilege;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.editable.annotation.UserChoice;-import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.WicketUtils;import io.onedev.utils.matchscore.MatchScoreProvider;import io.onedev.utils.matchscore.MatchScoreUtils;@@ -23,31 +15,16 @@ public class UserChoiceProvider extends AbstractUserChoiceProvider {private static final long serialVersionUID = 1L;- private final UserChoice.Type type;+ private final List<UserFacade> choices;- public UserChoiceProvider(UserChoice.Type type) {- this.type = type;+ public UserChoiceProvider(List<UserFacade> choices) {+ this.choices = new ArrayList<>(choices);+ this.choices.sort(Comparator.comparing(UserFacade::getDisplayName));}@Overridepublic void query(String term, int page, Response<UserFacade> response) {- List<UserFacade> choices;- if (type == UserChoice.Type.PROJECT_READER) {- ProjectFacade project = (((ProjectPage) WicketUtils.getPage()).getProject()).getFacade();- choices = new ArrayList<UserFacade>(SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.READ));- } else if (type == UserChoice.Type.PROJECT_WRITER) {- ProjectFacade project = (((ProjectPage) WicketUtils.getPage()).getProject()).getFacade();- choices = new ArrayList<UserFacade>(SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.WRITE));- } else if (type == UserChoice.Type.PROJECT_ADMINISTRATOR) {- ProjectFacade project = (((ProjectPage) WicketUtils.getPage()).getProject()).getFacade();- choices = new ArrayList<UserFacade>(SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.ADMIN));- } else {- choices = new ArrayList<UserFacade>(OneDev.getInstance(CacheManager.class).getUsers().values());- }-- choices.sort(Comparator.comparing(UserFacade::getDisplayName));-- choices = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<UserFacade>() {+ List<UserFacade> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<UserFacade>() {@Overridepublic double getMatchScore(UserFacade object) {@@ -56,7 +33,7 @@ public class UserChoiceProvider extends AbstractUserChoiceProvider {});- new ResponseFiller<UserFacade>(response).fill(choices, page, WebConstants.PAGE_SIZE);+ new ResponseFiller<UserFacade>(response).fill(matched, page, WebConstants.PAGE_SIZE);}}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/BeanContext.java b/web/src/main/java/io/onedev/server/web/editable/BeanContext.javaindex e5a19bf15e..60a7cd30af 100644--- a/web/src/main/java/io/onedev/server/web/editable/BeanContext.java+++ b/web/src/main/java/io/onedev/server/web/editable/BeanContext.java@@ -8,11 +8,11 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import io.onedev.launcher.loader.AppLoader;+import io.onedev.server.util.editable.annotation.Editable;import io.onedev.utils.ClassUtils;@SuppressWarnings("serial")-public abstract class BeanContext<T> extends BeanDescriptor {+public class BeanContext extends BeanDescriptor {public BeanContext(Class<?> beanClass, Set<String> excludeProperties) {super(beanClass, excludeProperties);@@ -26,12 +26,30 @@ public abstract class BeanContext<T> extends BeanDescriptor {super(beanDescriptor);}- public abstract BeanViewer renderForView(String componentId, IModel<T> model);+ public BeanViewer renderForView(String componentId, IModel<Serializable> model) {+ checkBeanEditable();+ return new BeanViewer(componentId, this, model);+ }- public abstract BeanEditor<T> renderForEdit(String componentId, IModel<T> model);+ public BeanEditor renderForEdit(String componentId, IModel<Serializable> model) {+ checkBeanEditable();+ return new BeanEditor(componentId, this, model);+ }- public IModel<T> wrapAsSelfUpdating(final IModel<T> model) {- return new IModel<T>() {+ private void checkBeanEditable() {+ Class<?> beanClass = getBeanClass();+ if (beanClass.getAnnotation(Editable.class) == null) {+ throw new RuntimeException("Can not edit bean " + beanClass+ + " as it is not annotated with @Editable");+ } else if (!ClassUtils.isConcrete(beanClass)) {+ throw new RuntimeException("Can not edit bean " + beanClass+ + " as it is not concrete");+ }++ }++ public IModel<Serializable> wrapAsSelfUpdating(final IModel<Serializable> model) {+ return new IModel<Serializable>() {@Overridepublic void detach() {@@ -39,37 +57,36 @@ public abstract class BeanContext<T> extends BeanDescriptor {}@Override- public T getObject() {+ public Serializable getObject() {return model.getObject();}@Override- public void setObject(T object) {+ public void setObject(Serializable object) {copyProperties(object, getObject());}};}- public static BeanEditor<Serializable> editModel(String componentId,+ public static BeanEditor editModel(String componentId,IModel<? extends Serializable> beanModel) {return editModel(componentId, beanModel, new HashSet<>());}-+@SuppressWarnings("unchecked")- public static BeanEditor<Serializable> editModel(String componentId,+ public static BeanEditor editModel(String componentId,IModel<? extends Serializable> beanModel, Set<String> excludeProperties) {- EditSupportRegistry registry = AppLoader.getInstance(EditSupportRegistry.class);Class<?> beanClass = ClassUtils.unproxy(beanModel.getObject().getClass());- BeanContext<Serializable> editContext = registry.getBeanEditContext(beanClass, excludeProperties);+ BeanContext editContext = new BeanContext(beanClass, excludeProperties);return editContext.renderForEdit(componentId, (IModel<Serializable>)beanModel);}- public static BeanEditor<Serializable> editBean(String componentId, Serializable bean) {+ public static BeanEditor editBean(String componentId, Serializable bean) {return editBean(componentId, bean, new HashSet<>());}-- public static BeanEditor<Serializable> editBean(String componentId, final Serializable bean,++ public static BeanEditor editBean(String componentId, final Serializable bean,Set<String> excludeProperties) {IModel<Serializable> beanModel = new IModel<Serializable>() {@@ -88,9 +105,8 @@ public abstract class BeanContext<T> extends BeanDescriptor {}};- EditSupportRegistry registry = AppLoader.getInstance(EditSupportRegistry.class);Class<?> beanClass = ClassUtils.unproxy(beanModel.getObject().getClass());- BeanContext<Serializable> editContext = registry.getBeanEditContext(beanClass, excludeProperties);+ BeanContext editContext = new BeanContext(beanClass, excludeProperties);beanModel = editContext.wrapAsSelfUpdating(beanModel);return editContext.renderForEdit(componentId, beanModel);}@@ -101,27 +117,16 @@ public abstract class BeanContext<T> extends BeanDescriptor {public static Component viewModel(String componentId, IModel<Serializable> beanModel,Set<String> excludeProperties) {- EditSupportRegistry registry = AppLoader.getInstance(EditSupportRegistry.class);- BeanContext<Serializable> editContext = registry.getBeanEditContext(- beanModel.getObject().getClass(), excludeProperties);+ BeanContext editContext = new BeanContext(beanModel.getObject().getClass(), excludeProperties);return editContext.renderForView(componentId, beanModel);}- public static Component viewBean(String componentId, Serializable bean) {- return viewBean(componentId, bean, new HashSet<>());- }-public static Component viewBean(String componentId, Serializable bean, Set<String> excludeProperties) {return viewModel(componentId, Model.of(bean), excludeProperties);}- public static BeanContext<Serializable> of(Class<?> beanClass) {- return of(beanClass, new HashSet<>());- }-- public static BeanContext<Serializable> of(Class<?> beanClass, Set<String> excludeProperties) {- EditSupportRegistry registry = AppLoader.getInstance(EditSupportRegistry.class);- return registry.getBeanEditContext(beanClass, excludeProperties);+ public static Component viewBean(String componentId, Serializable bean) {+ return viewBean(componentId, bean, new HashSet<>());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/web/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex 9eae9b1494..3baea48aaf 100644--- a/web/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/web/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -32,14 +32,12 @@ public class BeanDescriptor implements Serializable {EditableUtils.sortAnnotatedElements(propertyGetters);for (Method propertyGetter: propertyGetters) {- if (propertyGetter.getAnnotation(Editable.class) == null- || excludeProperties.contains(BeanUtils.getPropertyName(propertyGetter))) {- continue;+ if (propertyGetter.getAnnotation(Editable.class) != null) {+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyGetter);+ propertyDescriptors.add(propertyDescriptor);+ String propertyName = BeanUtils.getPropertyName(propertyGetter);+ propertyDescriptor.setExcluded(BeanUtils.findSetter(propertyGetter) == null || excludeProperties.contains(propertyName));}- Method propertySetter = BeanUtils.findSetter(propertyGetter);- if (propertySetter == null)- continue;- propertyDescriptors.add(new PropertyDescriptor(propertyGetter, propertySetter));}}@@ -57,8 +55,10 @@ public class BeanDescriptor implements Serializable {}public void copyProperties(Object from, Object to) {- for (PropertyDescriptor propertyDescriptor: getPropertyDescriptors())- propertyDescriptor.copyProperty(from, to);+ for (PropertyDescriptor propertyDescriptor: getPropertyDescriptors()) {+ if (!propertyDescriptor.isExcluded())+ propertyDescriptor.copyProperty(from, to);+ }}public Object newBeanInstance() {diff --git a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.html b/web/src/main/java/io/onedev/server/web/editable/BeanEditor.htmlsimilarity index 81%rename from web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.htmlrename to web/src/main/java/io/onedev/server/web/editable/BeanEditor.htmlindex 4a2e811f1b..bd90bad53a 100644--- a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.html+++ b/web/src/main/java/io/onedev/server/web/editable/BeanEditor.html@@ -1,5 +1,5 @@<wicket:panel>- <div wicket:id="content" class="reflection properties"></div>+ <div wicket:id="content" class="bean properties"></div><wicket:fragment wicket:id="verticalFrag"><div wicket:id="properties" class="form-group">@@ -18,13 +18,11 @@<wicket:fragment wicket:id="horizontalFrag"><table><tr wicket:id="properties">- <wicket:enclosure child="name">- <td class="name control-label">+ <td wicket:id="name" class="name control-label"><span wicket:id="name"></span><span wicket:id="required" class="required"></span></td>- </wicket:enclosure>- <td class="value">+ <td wicket:id="value" class="value"><div wicket:id="value"></div><div wicket:id="feedback"></div><div wicket:id="description" class="help-block"></div>@@ -32,5 +30,4 @@</tr></table></wicket:fragment>-</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/web/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 42e631c445..99072c82bd 100644--- a/web/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -1,49 +1,346 @@package io.onedev.server.web.editable;+import java.io.Serializable;+import java.util.ArrayList;import java.util.HashSet;+import java.util.List;+import java.util.Optional;import java.util.Set;import javax.validation.ConstraintViolation;import javax.validation.Validator;+import org.apache.wicket.Application;+import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.IHeaderResponse;+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.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidator;import io.onedev.launcher.loader.AppLoader;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.JsoupUtils;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.util.editable.annotation.DefaultValueProvider;+import io.onedev.server.util.editable.annotation.Horizontal;+import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.util.editable.annotation.Vertical;import io.onedev.server.web.editable.PathSegment.Property;+import io.onedev.server.web.editable.bean.BeanPropertyEditor;+import io.onedev.server.web.editable.polymorphic.PolymorphicPropertyEditor;+import io.onedev.server.web.util.ComponentContext;+import io.onedev.utils.ReflectionUtils;+import io.onedev.utils.StringUtils;@SuppressWarnings("serial")-public abstract class BeanEditor<T> extends ValueEditor<T> {+public class BeanEditor extends ValueEditor<Serializable> {+ public static final String SCRIPT_CONTEXT_BEAN = "beanEditor";+private final BeanDescriptor beanDescriptor;- private final Set<String> propertyNames = new HashSet<>();+ private final List<PropertyContext<Serializable>> propertyContexts = new ArrayList<>();++ private final boolean vertical;++ private RepeatingView propertiesView;- public BeanEditor(String id, BeanDescriptor beanDescriptor, IModel<T> model) {+ public BeanEditor(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {super(id, model);this.beanDescriptor = beanDescriptor;for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors())- propertyNames.add(propertyDescriptor.getPropertyName());+ propertyContexts.add(PropertyContext.of(propertyDescriptor));++ Class<?> beanClass = beanDescriptor.getBeanClass();+ if (beanClass.getAnnotation(Vertical.class) != null)+ vertical = true;+ else if (beanClass.getAnnotation(Horizontal.class) != null)+ vertical = false;+ else+ vertical = true;+ }++ private boolean hasTransitiveDependency(String dependentPropertyName, String dependencyPropertyName,+ Set<String> checkedPropertyNames) {+ if (checkedPropertyNames.contains(dependentPropertyName))+ return false;+ checkedPropertyNames.add(dependentPropertyName);+ Set<String> directDependencies = getPropertyContext(dependentPropertyName).getDependencyPropertyNames();+ if (directDependencies.contains(dependencyPropertyName))+ return true;+ for (String directDependency: directDependencies) {+ if (hasTransitiveDependency(directDependency, dependencyPropertyName, checkedPropertyNames))+ return true;+ }+ return false;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ PropertyUpdating propertyUpdating = (PropertyUpdating) event.getPayload();+ List<PropertyContainer> propertyContainers = new ArrayList<>();+ for (Component item: propertiesView)+ propertyContainers.add((PropertyContainer) item);+ for (PropertyContainer propertyContainer: propertyContainers) {+ int propertyIndex = (int) propertyContainer.getDefaultModelObject();+ PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);+ Set<String> checkedPropertyNames = new HashSet<>();+ if (hasTransitiveDependency(propertyContext.getPropertyName(),+ propertyUpdating.getPropertyName(), checkedPropertyNames)) {+ Component newPropertyContainer = newItem(propertyContainer.getId(), propertyIndex);+ propertyContainer.replaceWith(newPropertyContainer);+ propertyUpdating.getHandler().add(newPropertyContainer);+ }+ }+ validate();+ if (!hasErrors(true))+ send(this, Broadcast.BUBBLE, new BeanUpdating(propertyUpdating.getHandler()));+ else+ clearErrors(true);+ }+ }++ private WebMarkupContainer newItem(String id, int propertyIndex) {+ PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);++ WebMarkupContainer item = new PropertyContainer(id, propertyIndex) {++ private Label descriptionLabel;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setOutputMarkupPlaceholderTag(true);++ WebMarkupContainer nameContainer;+ WebMarkupContainer valueContainer;+ if (!vertical) {+ add(nameContainer = new WebMarkupContainer("name"));+ add(valueContainer = new WebMarkupContainer("value"));+ } else {+ nameContainer = this;+ valueContainer = this;+ }+ String name = EditableUtils.getName(propertyContext.getPropertyGetter());+ name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);+ Label nameLabel = new Label("name", name);+ nameContainer.add(nameLabel);++ OmitName omitName = propertyContext.getPropertyGetter().getAnnotation(OmitName.class);+ if (omitName != null && omitName.value() != OmitName.Place.VIEWER) {+ if (!vertical) {+ nameContainer.setVisible(false);+ valueContainer.add(AttributeAppender.replace("colspan", "2"));+ } else {+ nameLabel.setVisible(false);+ }+ }++ String required;+ if (propertyContext.isPropertyRequired()+ && propertyContext.getPropertyClass() != boolean.class+ && propertyContext.getPropertyClass() != Boolean.class+ && propertyContext.getPropertyClass() != List.class) {+ required = "*";+ } else {+ required = " ";+ }++ nameContainer.add(new Label("required", required).setEscapeModelStrings(false));++ Serializable propertyValue;++ OneContext context = new ComponentContext(this);++ OneContext.push(context);+ try {+ DefaultValueProvider defaultValueProvider = propertyContext.getPropertyGetter().getAnnotation(DefaultValueProvider.class);+ if (defaultValueProvider != null) {+ propertyValue = (Serializable) ReflectionUtils.invokeStaticMethod(+ propertyContext.getBeanClass(), defaultValueProvider.value());+ } else {+ propertyValue = (Serializable) propertyContext.getPropertyValue(getModelObject());+ }+ } finally {+ OneContext.pop();+ }+ PropertyEditor<Serializable> propertyEditor = propertyContext.renderForEdit("value", Model.of(propertyValue));+ valueContainer.add(propertyEditor);++ String description = EditableUtils.getDescription(propertyContext.getPropertyGetter());+ if (description != null) {+ OneContext.push(new ComponentContext(this));+ try {+ description = Application.get().getResourceSettings().getLocalizer().getString(description, this, description);+ description = GroovyUtils.evalGString(description);+ description = JsoupUtils.clean(description).body().html();+ } finally {+ OneContext.pop();+ }+ }+ descriptionLabel = new Label("description", description) {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ if (StringUtils.isNotBlank(getModelValue())) {+ /*+ * Hide the description when bean editor is in-place as we do not want to confuse the bean editor+ * property help with this help+ */+ if (propertyEditor instanceof PolymorphicPropertyEditor || propertyEditor instanceof BeanPropertyEditor) {+ BeanEditor childBeanEditor = propertyEditor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor, BeanEditor>() {++ @Override+ public void component(BeanEditor object, IVisit<BeanEditor> visit) {+ visit.stop(object);+ }++ });+ setVisible(childBeanEditor == null || !childBeanEditor.isVisible());+ } else {+ setVisible(true);+ }+ } else {+ setVisible(false);+ }+ }++ };+ descriptionLabel.setEscapeModelStrings(false);+ descriptionLabel.setOutputMarkupPlaceholderTag(true);+ valueContainer.add(descriptionLabel);++ valueContainer.add(new FencedFeedbackPanel("feedback", propertyEditor));++ valueContainer.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof PropertyUpdating)+ ((PropertyUpdating)event.getPayload()).getHandler().add(descriptionLabel);+ }++ @Override+ public Object getOnScreenValue(String name) {+ /*+ * Field will be be display name of the property when the bean class being edited is+ * generated via groovy script+ */+ String propertyName = getPropertyName(name);+ propertyContext.getDependencyPropertyNames().add(propertyName);++ Optional<Object> result= BeanEditor.this.visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<?>, Optional<Object>>() {++ @Override+ public void component(PropertyEditor<?> object, IVisit<Optional<Object>> visit) {+ if (object.getPropertyDescriptor().getPropertyName().equals(propertyName)) {+ visit.stop(Optional.ofNullable(object.getConvertedInput()));+ } else {+ visit.dontGoDeeper();+ }+ }++ });+ if (result == null)+ return getPropertyContext(propertyName).getPropertyValue(getModelObject());+ else+ return result.orElse(null);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(propertyContext.isPropertyVisible(this) && !propertyContext.isExcluded());+ }++ @Override+ public PropertyContext<?> getPropertyContext(String propertyName) {+ return BeanEditor.this.getPropertyContext(propertyName);+ }++ };++ return item;}+ public PropertyContext<?> getPropertyContext(String propertyName) {+ for (PropertyContext<?> propertyContext: propertyContexts) {+ if (propertyContext.getPropertyName().equals(propertyName))+ return propertyContext;+ }+ throw new RuntimeException("Property not found: " + propertyName);+ }+@Overrideprotected void onInitialize() {super.onInitialize();- add(new IValidator<T>() {+ Fragment fragment;+ if (vertical) {+ fragment = new Fragment("content", "verticalFrag", this);+ fragment.add(AttributeAppender.append("class", " vertical"));+ } else {+ fragment = new Fragment("content", "horizontalFrag", this);+ fragment.add(AttributeAppender.append("class", " horizontal"));+ }++ add(fragment);++ propertiesView = new RepeatingView("properties");+ fragment.add(propertiesView);++ for (int i=0; i<propertyContexts.size(); i++) {+ propertiesView.add(newItem(propertiesView.newChildId(), i));+ }++ add(new IValidator<Serializable>() {@Override- public void validate(IValidatable<T> validatable) {+ public void validate(IValidatable<Serializable> validatable) {Validator validator = AppLoader.getInstance(Validator.class);- for (ConstraintViolation<T> violation: validator.validate(validatable.getValue())) {+ for (ConstraintViolation<Serializable> violation: validator.validate(validatable.getValue())) {ValuePath valuePath = new ValuePath(violation.getPropertyPath());if (!valuePath.getElements().isEmpty()) {PathSegment.Property property = (Property) valuePath.getElements().iterator().next();- if (!propertyNames.contains(property.getName()))+ boolean found = false;+ for (Component item: propertiesView) {+ int propertyIndex = (int) item.getDefaultModelObject();+ PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);+ if (propertyContext.getPropertyName().equals(property.getName())+ && propertyContext.isPropertyVisible((PropertyContextAware) item)+ && !propertyContext.isExcluded()) {+ found = true;+ break;+ }+ }+ if (!found)continue;}ErrorContext errorContext = getErrorContext(valuePath);@@ -54,10 +351,73 @@ public abstract class BeanEditor<T> extends ValueEditor<T> {});add(AttributeAppender.append("class", " bean editor editable"));++ setOutputMarkupId(true);}public BeanDescriptor getBeanDescriptor() {return beanDescriptor;}+ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ final PathSegment.Property property = (Property) pathSegment;+ return visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {++ @Override+ public void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {+ if (object.getPropertyDescriptor().getPropertyName().equals(property.getName()))+ visit.stop(object);+ else+ visit.dontGoDeeper();+ }++ });+ }++ @Override+ protected Serializable convertInputToValue() throws ConversionException {+ final Serializable bean = (Serializable) getBeanDescriptor().newBeanInstance();++ visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {++ @Override+ public void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {+ if (!object.getPropertyDescriptor().isExcluded())+ object.getPropertyDescriptor().setPropertyValue(bean, object.getConvertedInput());+ visit.dontGoDeeper();+ }++ });++ return bean;+ }++ public String getPropertyName(String name) {+ for (PropertyContext<?> propertyContext: propertyContexts) {+ String displayName = EditableUtils.getName(propertyContext.getPropertyGetter());+ if (propertyContext.getPropertyName().equals(name) || displayName.equals(name))+ return propertyContext.getPropertyName();+ }+ throw new RuntimeException("No property found with name: " + name);+ }++ private abstract class PropertyContainer extends WebMarkupContainer implements EditContext, PropertyContextAware {++ public PropertyContainer(String id, int propertyIndex) {+ super(id, Model.of(propertyIndex));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new PropertyContainerResourceReference()));++ String script = String.format("onedev.server.propertyContainer.onDomReady('%s');", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ }+}diff --git a/web/src/main/java/io/onedev/server/web/editable/BeanUpdating.java b/web/src/main/java/io/onedev/server/web/editable/BeanUpdating.javanew file mode 100644index 0000000000..9c9d694ce0--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/BeanUpdating.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import io.onedev.server.web.util.AjaxPayload;++public class BeanUpdating extends AjaxPayload {++ public BeanUpdating(IPartialPageRequestHandler target) {+ super(target);+ }++}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/BeanViewer.html b/web/src/main/java/io/onedev/server/web/editable/BeanViewer.htmlindex cd1868fdae..18c6e261a3 100644--- a/web/src/main/java/io/onedev/server/web/editable/BeanViewer.html+++ b/web/src/main/java/io/onedev/server/web/editable/BeanViewer.html@@ -1,3 +1,10 @@<wicket:panel>- <wicket:container wicket:id="content"></wicket:container>+ <div class="bean properties">+ <table>+ <tr wicket:id="properties">+ <td wicket:id="name" class="name"><span wicket:id="content"></span></td>+ <td wicket:id="value" class="value"><div wicket:id="content"></div></td>+ </tr>+ </table>+ </div></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/web/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex e5314151ff..c0e92e5d21 100644--- a/web/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/web/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -1,26 +1,92 @@package io.onedev.server.web.editable;+import java.io.Serializable;+import java.lang.reflect.Method;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Application;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import io.onedev.server.util.EditContext;+import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.util.editable.annotation.OmitName;@SuppressWarnings("serial")-public abstract class BeanViewer extends Panel {+public class BeanViewer extends Panel implements PropertyContextAware, EditContext {- private final BeanDescriptor beanDescriptor;+ private final List<PropertyContext<Serializable>> propertyContexts = new ArrayList<>();- public BeanViewer(String id, BeanDescriptor beanDescriptor) {- super(id);- this.beanDescriptor = beanDescriptor;+ public BeanViewer(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {+ super(id, model);++ for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {+ propertyContexts.add(PropertyContext.of(propertyDescriptor));+ }}@Overrideprotected void onInitialize() {super.onInitialize();- add(newContent("content", beanDescriptor));+ add(new ListView<PropertyContext<Serializable>>("properties", propertyContexts) {++ @Override+ protected void populateItem(ListItem<PropertyContext<Serializable>> item) {+ PropertyContext<Serializable> propertyContext = item.getModelObject();+ Method propertyGetter = propertyContext.getPropertyGetter();++ WebMarkupContainer nameTd = new WebMarkupContainer("name");+ item.add(nameTd);+ WebMarkupContainer valueTd = new WebMarkupContainer("value");+ item.add(valueTd);++ String name = EditableUtils.getName(propertyGetter);+ name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);+ Component content = new Label("content", name);+ nameTd.add(content);+ OmitName omitName = propertyGetter.getAnnotation(OmitName.class);++ if (omitName != null && omitName.value() != OmitName.Place.EDITOR) {+ nameTd.setVisible(false);+ valueTd.add(AttributeAppender.replace("colspan", "2"));+ item.add(AttributeAppender.append("class", "name-omitted"));+ }++ Serializable bean = (Serializable) BeanViewer.this.getDefaultModelObject();+ Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(bean);+ valueTd.add(propertyContext.renderForView("content", Model.of(propertyValue)));++ item.setVisible(propertyContext.isPropertyVisible(BeanViewer.this) && !propertyContext.isExcluded());++ item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));+ }++ });+add(AttributeAppender.append("class", "bean viewer editable"));}- protected abstract Component newContent(String id, BeanDescriptor beanDescriptor);+ @Override+ public PropertyContext<?> getPropertyContext(String propertyName) {+ for (PropertyContext<?> propertyContext: propertyContexts) {+ if (propertyContext.getPropertyName().equals(propertyName))+ return propertyContext;+ }+ throw new RuntimeException("Property not found: " + propertyName);+ }++ @Override+ public Object getOnScreenValue(String propertyName) {+ return getPropertyContext(propertyName).getPropertyValue(getDefaultModelObject());+ }+}diff --git a/web/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java b/web/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.javaindex 47e0f421d3..134944195b 100644--- a/web/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java+++ b/web/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java@@ -18,29 +18,17 @@ public class DefaultEditSupportRegistry implements EditSupportRegistry {this.editSupports = new ArrayList<EditSupport>(editSupports);}- @SuppressWarnings("unchecked")- @Override- public BeanContext<Serializable> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- for (EditSupport each: editSupports) {- BeanContext<?> editContext = each.getBeanEditContext(beanClass, excludeProperties);- if (editContext != null)- return (BeanContext<Serializable>) editContext;- }- throw new RuntimeException(String.format("Unable to find edit context (bean: %s). "- + "Possible reason: forget to annotate the class with @Editable.", beanClass.getName()));- }-@SuppressWarnings("unchecked")@Overridepublic PropertyContext<Serializable> getPropertyEditContext(Class<?> beanClass, String propertyName) {for (EditSupport each: editSupports) {- PropertyContext<?> editContext = each.getPropertyEditContext(beanClass, propertyName);+ PropertyContext<?> editContext = each.getEditContext(beanClass, propertyName);if (editContext != null)return (PropertyContext<Serializable>) editContext;}throw new RuntimeException(String.format("Unable to find edit context (bean: %s, property: %s). Possible reason: forget to annotate "- + "return type of the method with @Editable.",+ + "return type of the method with @Editable",beanClass.getName(), propertyName));}diff --git a/web/src/main/java/io/onedev/server/web/editable/EditSupport.java b/web/src/main/java/io/onedev/server/web/editable/EditSupport.javaindex 78844bed87..2af3b20947 100644--- a/web/src/main/java/io/onedev/server/web/editable/EditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/EditSupport.java@@ -1,14 +1,12 @@package io.onedev.server.web.editable;import java.io.Serializable;-import java.util.Set;import io.onedev.launcher.loader.ExtensionPoint;@ExtensionPointpublic interface EditSupport extends Serializable {- BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties);+ PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName);- PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName);}diff --git a/web/src/main/java/io/onedev/server/web/editable/EditSupportRegistry.java b/web/src/main/java/io/onedev/server/web/editable/EditSupportRegistry.javaindex 8d1623c74d..0f6e78a475 100644--- a/web/src/main/java/io/onedev/server/web/editable/EditSupportRegistry.java+++ b/web/src/main/java/io/onedev/server/web/editable/EditSupportRegistry.java@@ -1,12 +1,9 @@package io.onedev.server.web.editable;import java.io.Serializable;-import java.util.Set;public interface EditSupportRegistry {- BeanContext<Serializable> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties);-PropertyContext<Serializable> getPropertyEditContext(Class<?> beanClass, String propertyName);}diff --git a/web/src/main/java/io/onedev/server/web/editable/EditorChanged.java b/web/src/main/java/io/onedev/server/web/editable/EditorChanged.javadeleted file mode 100644index 5844d46055..0000000000--- a/web/src/main/java/io/onedev/server/web/editable/EditorChanged.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable;--import org.apache.wicket.ajax.AjaxRequestTarget;--import io.onedev.server.web.util.AjaxPayload;--public class EditorChanged extends AjaxPayload {-- public EditorChanged(AjaxRequestTarget target) {- super(target);- }--}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java b/web/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.javanew file mode 100644index 0000000000..07c9fe8531--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java@@ -0,0 +1,25 @@+package io.onedev.server.web.editable;++import java.lang.reflect.AnnotatedElement;++import org.apache.wicket.markup.html.basic.Label;+import org.unbescape.html.HtmlEscape;++import io.onedev.server.util.editable.annotation.NameOfEmptyValue;++@SuppressWarnings("serial")+public class EmptyValueLabel extends Label {++ public EmptyValueLabel(String id, AnnotatedElement element) {+ super(id, "<i>" + getNameOfEmptyValue(element) + "</i>");+ setEscapeModelStrings(false);+ }++ private static String getNameOfEmptyValue(AnnotatedElement element) {+ NameOfEmptyValue nameOfEmptyValue = element.getAnnotation(NameOfEmptyValue.class);+ if (nameOfEmptyValue != null)+ return HtmlEscape.escapeHtml5(nameOfEmptyValue.value());+ else+ return "Not defined";+ }+}diff --git a/web/src/main/java/io/onedev/server/web/editable/NotDefinedLabel.java b/web/src/main/java/io/onedev/server/web/editable/NotDefinedLabel.javadeleted file mode 100644index efa163a342..0000000000--- a/web/src/main/java/io/onedev/server/web/editable/NotDefinedLabel.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable;--import org.apache.wicket.markup.html.basic.Label;--@SuppressWarnings("serial")-public class NotDefinedLabel extends Label {-- public NotDefinedLabel(String id) {- super(id, "<i>Not defined</i>");- setEscapeModelStrings(false);- }--}diff --git a/web/src/main/java/io/onedev/server/web/editable/PropertyContainerResourceReference.java b/web/src/main/java/io/onedev/server/web/editable/PropertyContainerResourceReference.javanew file mode 100644index 0000000000..8947b6be5c--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/PropertyContainerResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable;++import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class PropertyContainerResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public PropertyContainerResourceReference() {+ super(PropertyContainerResourceReference.class, "property-container.js");+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/PropertyContext.java b/web/src/main/java/io/onedev/server/web/editable/PropertyContext.javaindex d28441009e..d86fa9fc08 100644--- a/web/src/main/java/io/onedev/server/web/editable/PropertyContext.java+++ b/web/src/main/java/io/onedev/server/web/editable/PropertyContext.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable;import java.io.Serializable;+import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -8,6 +9,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import io.onedev.launcher.loader.AppLoader;+import jersey.repackaged.com.google.common.collect.Lists;@SuppressWarnings("serial")public abstract class PropertyContext<T> extends PropertyDescriptor {@@ -19,10 +21,14 @@ public abstract class PropertyContext<T> extends PropertyDescriptor {public PropertyContext(PropertyDescriptor propertyDescriptor) {super(propertyDescriptor);}-+public abstract PropertyViewer renderForView(String componentId, IModel<T> model);public abstract PropertyEditor<T> renderForEdit(String componentId, IModel<T> model);++ public List<String> getPossibleValues() {+ return Lists.newArrayList();+ }public static PropertyEditor<Serializable> editModel(String componentId,final IModel<Serializable> beanModel, String propertyName) {@@ -93,6 +99,9 @@ public abstract class PropertyContext<T> extends PropertyDescriptor {}public static PropertyContext<Serializable> of(PropertyDescriptor propertyDescriptor) {- return of(propertyDescriptor.getBeanClass(), propertyDescriptor.getPropertyName());+ PropertyContext<Serializable> propertyContext = of(propertyDescriptor.getBeanClass(), propertyDescriptor.getPropertyName());+ propertyContext.setExcluded(propertyDescriptor.isExcluded());+ return propertyContext;}+}diff --git a/web/src/main/java/io/onedev/server/web/editable/PropertyContextAware.java b/web/src/main/java/io/onedev/server/web/editable/PropertyContextAware.javanew file mode 100644index 0000000000..bec2c20143--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/PropertyContextAware.java@@ -0,0 +1,7 @@+package io.onedev.server.web.editable;++public interface PropertyContextAware {++ PropertyContext<?> getPropertyContext(String propertyName);++}diff --git a/web/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/web/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 2e488e461c..c0cf837076 100644--- a/web/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/web/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -3,13 +3,20 @@ package io.onedev.server.web.editable;import java.io.Serializable;import java.lang.reflect.InvocationTargetException;import java.lang.reflect.Method;+import java.util.HashSet;+import java.util.Set;import javax.validation.constraints.NotNull;import javax.validation.constraints.Size;+import org.apache.wicket.Component;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.ShowCondition;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.BeanUtils;+import io.onedev.utils.ReflectionUtils;public class PropertyDescriptor implements Serializable {@@ -19,6 +26,10 @@ public class PropertyDescriptor implements Serializable {private final String propertyName;+ private boolean excluded;++ private final Set<String> dependencyPropertyNames = new HashSet<>();+private transient Method propertyGetter;private transient Method propertySetter;@@ -31,21 +42,12 @@ public class PropertyDescriptor implements Serializable {public PropertyDescriptor(Method propertyGetter) {this.beanClass = propertyGetter.getDeclaringClass();this.propertyName = BeanUtils.getPropertyName(propertyGetter);- this.propertyGetter = propertyGetter;}- public PropertyDescriptor(Method propertyGetter, Method propertySetter) {- this.beanClass = propertyGetter.getDeclaringClass();- this.propertyName = BeanUtils.getPropertyName(propertyGetter);- this.propertyGetter = propertyGetter;- this.propertySetter = propertySetter;- }-public PropertyDescriptor(PropertyDescriptor propertyDescriptor) {this.beanClass = propertyDescriptor.getBeanClass();this.propertyName = propertyDescriptor.getPropertyName();- this.propertyGetter = propertyDescriptor.getPropertyGetter();- this.propertySetter = propertyDescriptor.getPropertySetter();+ this.excluded = propertyDescriptor.isExcluded();}public Class<?> getBeanClass() {@@ -63,11 +65,19 @@ public class PropertyDescriptor implements Serializable {}public Method getPropertySetter() {- if (propertySetter == null)+ if (propertySetter == null)propertySetter = BeanUtils.getSetter(getPropertyGetter());return propertySetter;}+ public boolean isExcluded() {+ return excluded;+ }++ public void setExcluded(boolean excluded) {+ this.excluded = excluded;+ }+public void copyProperty(Object fromBean, Object toBean) {setPropertyValue(toBean, getPropertyValue(fromBean));}@@ -99,4 +109,33 @@ public class PropertyDescriptor implements Serializable {|| getPropertyGetter().getAnnotation(Size.class) != null && getPropertyGetter().getAnnotation(Size.class).min()>=1;}+ public boolean isPropertyVisible(PropertyContextAware propertyContextAware) {+ return isPropertyVisible(propertyContextAware, new HashSet<>());+ }++ public boolean isPropertyVisible(PropertyContextAware propertyContextAware, Set<String> checkedPropertyNames) {+ if (checkedPropertyNames.contains(getPropertyName()))+ return true;+ checkedPropertyNames.add(getPropertyName());++ OneContext.push(new ComponentContext((Component) propertyContextAware));+ try {+ ShowCondition showCondition = getPropertyGetter().getAnnotation(ShowCondition.class);+ if (showCondition != null && !(boolean)ReflectionUtils.invokeStaticMethod(getBeanClass(), showCondition.value()))+ return false;+ for (String propertyName: getDependencyPropertyNames()) {+ PropertyContext<?> propertyContext = propertyContextAware.getPropertyContext(propertyName);+ if (!propertyContext.isPropertyVisible(propertyContextAware, checkedPropertyNames))+ return false;+ }+ return true;+ } finally {+ OneContext.pop();+ }+ }++ public Set<String> getDependencyPropertyNames() {+ return dependencyPropertyNames;+ }+}diff --git a/web/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex 012a7396f7..bd8336d975 100644--- a/web/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -6,6 +6,8 @@ import javax.validation.ConstraintViolation;import javax.validation.Validator;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.event.Broadcast;import org.apache.wicket.model.IModel;import org.apache.wicket.validation.INullAcceptingValidator;import org.apache.wicket.validation.IValidatable;@@ -48,6 +50,14 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {add(new AttributeAppender("class", " property editor editable"));}+ protected void onPropertyUpdating(IPartialPageRequestHandler target) {+ validate();+ if (!hasErrors(true))+ send(getParent(), Broadcast.BUBBLE, new PropertyUpdating(target, propertyDescriptor.getPropertyName()));+ else+ clearErrors(true);+ }+public PropertyDescriptor getPropertyDescriptor() {return propertyDescriptor;}diff --git a/web/src/main/java/io/onedev/server/web/editable/PropertyUpdating.java b/web/src/main/java/io/onedev/server/web/editable/PropertyUpdating.javanew file mode 100644index 0000000000..cd678582fe--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/PropertyUpdating.java@@ -0,0 +1,20 @@+package io.onedev.server.web.editable;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import io.onedev.server.web.util.AjaxPayload;++public class PropertyUpdating extends AjaxPayload {++ private final String propertyName;++ public PropertyUpdating(IPartialPageRequestHandler target, String propertyName) {+ super(target);+ this.propertyName = propertyName;+ }++ public String getPropertyName() {+ return propertyName;+ }++}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/ValueEditor.java b/web/src/main/java/io/onedev/server/web/editable/ValueEditor.javaindex 69eea54518..46eb67749e 100644--- a/web/src/main/java/io/onedev/server/web/editable/ValueEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/ValueEditor.java@@ -2,15 +2,19 @@ package io.onedev.server.web.editable;import javax.annotation.Nullable;+import org.apache.wicket.markup.html.form.FormComponent;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.util.convert.ConversionException;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;@SuppressWarnings("serial")public abstract class ValueEditor<T> extends FormComponentPanel<T> implements ErrorContext {public ValueEditor(String id, IModel<T> model) {super(id, model);+ setConvertedInput(model.getObject());}public @Nullable ErrorContext getErrorContext(ValuePath partPath) {@@ -25,6 +29,21 @@ public abstract class ValueEditor<T> extends FormComponentPanel<T> implements Erreturn context;}+ public void clearErrors(boolean recursive) {+ if (recursive) {+ visitFormComponentsPostOrder(this, new IVisitor<FormComponent<?>, Void>() {++ @Override+ public void component(FormComponent<?> formComponent, IVisit<Void> visit) {+ formComponent.getFeedbackMessages().clear();+ }++ });+ } else {+ getFeedbackMessages().clear();+ }+ }+/*** Get error context for specified path segment.*@@ -44,7 +63,7 @@ public abstract class ValueEditor<T> extends FormComponentPanel<T> implements Ererror(newValidationError(e));}}-+@Overridepublic void addError(String errorMessage) {error(errorMessage);diff --git a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.javasimilarity index 51%rename from web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionEditSupport.javarename to web/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.javaindex f015797c50..23c00f0b75 100644--- a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java@@ -1,18 +1,14 @@-package io.onedev.server.web.editable.reflection;+package io.onedev.server.web.editable.bean;import java.io.Serializable;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.BeanViewer;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -20,38 +16,10 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.utils.ClassUtils;@SuppressWarnings("serial")-public class ReflectionEditSupport implements EditSupport {+public class BeanEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- if (beanClass.getAnnotation(Editable.class) != null && ClassUtils.isConcrete(beanClass)) {- return new BeanContext<Serializable>(beanClass, excludeProperties) {-- @Override- public BeanViewer renderForView(String componentId, final IModel<Serializable> model) {- return new BeanViewer(componentId, this) {-- @Override- protected Component newContent(String id, BeanDescriptor beanDescriptor) {- return new ReflectionBeanViewer(id, beanDescriptor, model);- }-- };- }-- @Override- public BeanEditor<Serializable> renderForEdit(String componentId, IModel<Serializable> model) {- return new ReflectionBeanEditor(componentId, this, model);- }-- };- } else {- return null;- }- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Class<?> propertyClass = propertyDescriptor.getPropertyClass();if (propertyClass.getAnnotation(Editable.class) != null && ClassUtils.isConcrete(propertyClass)) {@@ -66,7 +34,7 @@ public class ReflectionEditSupport implements EditSupport {if (model.getObject() != null) {return BeanContext.viewBean(id, model.getObject());} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}@@ -75,7 +43,7 @@ public class ReflectionEditSupport implements EditSupport {@Overridepublic PropertyEditor<Serializable> renderForEdit(String componentId, IModel<Serializable> model) {- return new ReflectionPropertyEditor(componentId, this, model);+ return new BeanPropertyEditor(componentId, this, model);}};diff --git a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.htmlrename to web/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.htmldiff --git a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.javasimilarity index 73%rename from web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.javarename to web/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.javaindex 4d9b5f012d..05444f0a53 100644--- a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java@@ -1,30 +1,30 @@-package io.onedev.server.web.editable.reflection;+package io.onedev.server.web.editable.bean;import java.io.Serializable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.model.IModel;import org.apache.wicket.util.convert.ConversionException;+import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.EditorChanged;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@SuppressWarnings("serial")-public class ReflectionPropertyEditor extends PropertyEditor<Serializable> {+public class BeanPropertyEditor extends PropertyEditor<Serializable> {private final String BEAN_EDITOR_ID = "beanEditor";- public ReflectionPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Serializable> propertyModel) {+ public BeanPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Serializable> propertyModel) {super(id, propertyDescriptor, propertyModel);}@@ -44,16 +44,17 @@ public class ReflectionPropertyEditor extends PropertyEditor<Serializable> {@Overridepublic Boolean getObject() {- return ReflectionPropertyEditor.this.get(BEAN_EDITOR_ID).isVisible();+ Component beanEditor = BeanPropertyEditor.this.get(BEAN_EDITOR_ID);+ return beanEditor != null && beanEditor.isVisible();}@Overridepublic void setObject(Boolean object) {- Component beanEditor = ReflectionPropertyEditor.this.get(BEAN_EDITOR_ID);+ Component beanEditor = BeanPropertyEditor.this.get(BEAN_EDITOR_ID);if (beanEditor instanceof BeanEditor || !object) {beanEditor.setVisible(object);} else {- ReflectionPropertyEditor.this.replace(newBeanEditor(newProperty()));+ BeanPropertyEditor.this.replace(newBeanEditor(newProperty()));}}@@ -61,8 +62,8 @@ public class ReflectionPropertyEditor extends PropertyEditor<Serializable> {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- send(ReflectionPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));- target.add(ReflectionPropertyEditor.this.get(BEAN_EDITOR_ID));+ onPropertyUpdating(target);+ target.add(BeanPropertyEditor.this.get(BEAN_EDITOR_ID));}}));@@ -77,6 +78,16 @@ public class ReflectionPropertyEditor extends PropertyEditor<Serializable> {add(newBeanEditor(propertyValue));}+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof BeanUpdating) {+ event.stop();+ onPropertyUpdating(((BeanUpdating)event.getPayload()).getHandler());+ }+ }+private Serializable newProperty() {try {return (Serializable) getPropertyDescriptor().getPropertyClass().newInstance();@@ -102,12 +113,11 @@ public class ReflectionPropertyEditor extends PropertyEditor<Serializable> {return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(pathSegment);}- @SuppressWarnings("unchecked")@Overrideprotected Serializable convertInputToValue() throws ConversionException {Component beanEditor = get(BEAN_EDITOR_ID);if (beanEditor.isVisible())- return ((BeanEditor<Serializable>) beanEditor).getConvertedInput();+ return ((BeanEditor) beanEditor).getConvertedInput();elsereturn null;}diff --git a/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.javanew file mode 100644index 0000000000..dc6473a249--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java@@ -0,0 +1,59 @@+package io.onedev.server.web.editable.beanlist;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;+import io.onedev.utils.ClassUtils;++@SuppressWarnings("serial")+public class BeanListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);++ if (List.class.isAssignableFrom(propertyDescriptor.getPropertyClass())) {+ final Class<?> elementClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass != null && ClassUtils.isConcrete(elementClass)+ && elementClass.getAnnotation(Editable.class) != null) {+ return new PropertyContext<List<Serializable>>(propertyDescriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {+ return new PropertyViewer(componentId, this) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new BeanListPropertyViewer(id, elementClass, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {+ return new BeanListPropertyEditor(componentId, this, model);+ }++ };+ }+ }+ return null;+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.htmlsimilarity index 91%rename from web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.htmlrename to web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.htmlindex df02f8e0e5..35b484caf6 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.html+++ b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html@@ -2,7 +2,7 @@<wicket:enclosure child:id="enable"><input wicket:id="enable" type="checkbox" class="enable"></input></wicket:enclosure>- <table wicket:id="listEditor" class="concrete list table table-hover">+ <table wicket:id="listEditor" class="bean list"><thead><th wicket:id="headers"><span wicket:id="header"></span>diff --git a/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javasimilarity index 89%rename from web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.javarename to web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 1d7c57e316..7ce43bc5ff 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.list.concrete;+package io.onedev.server.web.editable.beanlist;import static de.agilecoders.wicket.jquery.JQuery.$;@@ -13,7 +13,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FeedbackMessage;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -31,23 +31,23 @@ import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.EditorChanged;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathSegment.Property;+import io.onedev.server.web.editable.PropertyUpdating;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PathSegment.Property;import io.onedev.utils.ClassUtils;@SuppressWarnings("serial")-public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializable>> {+public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {private final List<PropertyContext<Serializable>> propertyContexts;private final Class<?> elementClass;- public ConcreteListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ public BeanListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);elementClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());@@ -97,20 +97,20 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializable@Overridepublic Boolean getObject() {- return ConcreteListPropertyEditor.this.get("listEditor").isVisible();+ return BeanListPropertyEditor.this.get("listEditor").isVisible();}@Overridepublic void setObject(Boolean object) {- ConcreteListPropertyEditor.this.get("listEditor").setVisible(object);+ BeanListPropertyEditor.this.get("listEditor").setVisible(object);}}).add(new AjaxFormComponentUpdatingBehavior("click") {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- send(ConcreteListPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));- target.add(ConcreteListPropertyEditor.this.get("listEditor"));+ onPropertyUpdating(target);+ target.add(BeanListPropertyEditor.this.get("listEditor"));}}));@@ -123,6 +123,16 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializableadd(newListEditor(list));}+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }+private Component newListEditor(List<Serializable> list) {final WebMarkupContainer table = new WebMarkupContainer("listEditor");@@ -147,7 +157,7 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializable});- final RepeatingView rows = new RepeatingView("elements");+ RepeatingView rows = new RepeatingView("elements");table.add(rows);if (list != null) {@@ -183,7 +193,7 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializabletarget.prependJavaScript(script);target.add(newRow);- send(ConcreteListPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));+ onPropertyUpdating(target);}}.setDefaultFormProcessing(false));@@ -195,7 +205,7 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializable@SuppressWarnings("deprecation")@Overrideprotected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- /*+ /*List<Component> children = new ArrayList<>();for (Component child: rows)children.add(child);@@ -219,8 +229,7 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializablefor (int i=0; i<fromIndex-toIndex; i++)rows.swap(fromIndex-i, fromIndex-i-1);}-- send(ConcreteListPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));+ onPropertyUpdating(target);}}.sortable("tbody").handle(".handle").helperClass("sort-helper"));@@ -228,8 +237,8 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializablereturn table;}- private WebMarkupContainer addRow(final RepeatingView rows, Serializable element) {- final WebMarkupContainer row = new WebMarkupContainer(rows.newChildId());+ private WebMarkupContainer addRow(RepeatingView rows, Serializable element) {+ WebMarkupContainer row = new WebMarkupContainer(rows.newChildId());row.setOutputMarkupId(true);rows.add(row);@@ -252,10 +261,11 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializable@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);-+target.appendJavaScript($(row).chain("remove").get());+ target.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId(true)));rows.remove(row);- send(ConcreteListPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));+ onPropertyUpdating(target);}}.setDefaultFormProcessing(false));@@ -341,7 +351,6 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializablefor (Component column: columns) {@SuppressWarnings("unchecked")PropertyEditor<Serializable> propertyEditor = (PropertyEditor<Serializable>) column.get("propertyEditor");-propertyEditor.getPropertyDescriptor().setPropertyValue(element, propertyEditor.getConvertedInput());}}@@ -350,4 +359,5 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializablereturn null;}}+}diff --git a/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.htmlsimilarity index 86%rename from web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.htmlrename to web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.htmlindex 97e2c18807..8e43ba9c52 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html+++ b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html@@ -1,6 +1,6 @@<wicket:panel><div class="property viewer">- <table class="concrete list table table-condensed">+ <table class="bean list table table-condensed"><thead><th wicket:id="headers"><span wicket:id="header"></span>diff --git a/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.java b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.javasimilarity index 91%rename from web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.javarename to web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.javaindex 9098f1c88b..daa1d49140 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.java+++ b/web/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.list.concrete;+package io.onedev.server.web.editable.beanlist;import java.io.Serializable;import java.util.ArrayList;@@ -18,13 +18,13 @@ import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;@SuppressWarnings("serial")-public class ConcreteListPropertyViewer extends Panel {+public class BeanListPropertyViewer extends Panel {private final List<PropertyContext<Serializable>> elementPropertyContexts;private final List<Serializable> elements;- public ConcreteListPropertyViewer(String id, Class<?> elementClass, List<Serializable> elements) {+ public BeanListPropertyViewer(String id, Class<?> elementClass, List<Serializable> elements) {super(id);elementPropertyContexts = new ArrayList<>();diff --git a/web/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.javaindex d22d622935..93bf190f87 100644--- a/web/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java@@ -1,15 +1,14 @@package io.onedev.server.web.editable.bool;import java.lang.reflect.Method;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -19,12 +18,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class BooleanEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();@@ -42,7 +36,11 @@ public class BooleanEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject().toString());} else {- return new NotDefinedLabel(id);+ NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);+ if (nameOfEmptyValue != null)+ return new Label(id, nameOfEmptyValue.value());+ else+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.javaindex d59fb6b1b9..8f7b9b80d1 100644--- a/web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.bool;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.model.IModel;@@ -26,7 +28,16 @@ public class BooleanPropertyEditor extends PropertyEditor<Boolean> {super.onInitialize();add(input = new CheckBox("input", Model.of(getModelObject())));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){+ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(new AttributeAppender("class", new LoadableDetachableModel<String>() {@Overridediff --git a/web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.javaindex 9cb4065839..427b323fb0 100644--- a/web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.bool;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.model.IModel;@@ -42,6 +44,15 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {add(input);+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(new AttributeAppender("class", new LoadableDetachableModel<String>() {@Overridediff --git a/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.javaindex fb2947de3a..cc3d3fdc9a 100644--- a/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java@@ -3,7 +3,6 @@ package io.onedev.server.web.editable.branchchoice;import java.lang.reflect.Method;import java.util.ArrayList;import java.util.List;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;@@ -12,9 +11,8 @@ import org.eclipse.jgit.util.StringUtils;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.editable.annotation.BranchChoice;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -24,12 +22,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class BranchEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();if (propertyGetter.getAnnotation(BranchChoice.class) != null) {@@ -51,7 +44,7 @@ public class BranchEditSupport implements EditSupport {}return new Label(id, StringUtils.join(branches, ", " ));} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}@@ -77,7 +70,7 @@ public class BranchEditSupport implements EditSupport {if (projectAndBranch != null) {return new Label(id, projectAndBranch);} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.javaindex 19ada3d91c..64acb4cb51 100644--- a/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java@@ -1,16 +1,15 @@package io.onedev.server.web.editable.branchpattern;import java.lang.reflect.Method;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.util.editable.annotation.BranchPattern;-import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -20,12 +19,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class BranchPatternEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();if (propertyGetter.getAnnotation(BranchPattern.class) != null) {@@ -45,7 +39,11 @@ public class BranchPatternEditSupport implements EditSupport {if (refMatch != null) {return new Label(id, refMatch);} else {- return new NotDefinedLabel(id);+ NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);+ if (nameOfEmptyValue != null)+ return new Label(id, nameOfEmptyValue.value());+ else+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.javanew file mode 100644index 0000000000..f765132d00--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/choice/ChoiceEditSupport.java@@ -0,0 +1,94 @@+package io.onedev.server.web.editable.choice;++import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++import io.onedev.server.util.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class ChoiceEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);++ Class<?> propertyClass = propertyDescriptor.getPropertyGetter().getReturnType();+ if (propertyDescriptor.getPropertyGetter().getAnnotation(ChoiceProvider.class) != null) {+ if (propertyClass == String.class) {+ return new PropertyContext<String>(propertyDescriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, this) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new Label(id, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new SingleChoiceEditor(componentId, this, model);+ }++ };+ } else if (List.class.isAssignableFrom(propertyDescriptor.getPropertyClass())) {+ return new PropertyContext<List<String>>(propertyDescriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {++ return new PropertyViewer(componentId, this) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null && !model.getObject().isEmpty()) {+ String content = "";+ for (String each: model.getObject()) {+ if (content.length() == 0)+ content += each.toString();+ else+ content += ", " + each.toString();+ }+ return new Label(id, content);+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {+ return new MultiChoiceEditor(componentId, this, model);+ }++ };+ } else {+ throw new IllegalStateException("@ChoiceProvider annotation should only be "+ + "applied to a String or List<String> property");+ }+ } else {+ return null;+ }++ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.htmlrename to web/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.htmldiff --git a/web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javasimilarity index 68%rename from web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.javarename to web/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 1eb1406e49..1d7c35a198 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.list;+package io.onedev.server.web.editable.choice;import java.io.Serializable;import java.util.ArrayList;@@ -6,6 +6,8 @@ import java.util.Collection;import java.util.List;import org.apache.commons.lang3.StringEscapeUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;@@ -14,6 +16,7 @@ import org.json.JSONWriter;import com.google.common.base.Preconditions;+import io.onedev.server.util.OneContext;import io.onedev.server.web.component.select2.ChoiceProvider;import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.Select2MultiChoice;@@ -21,39 +24,48 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")-public class StringListPropertyEditor extends PropertyEditor<List<String>> {+public class MultiChoiceEditor extends PropertyEditor<List<String>> {private final List<String> choices = new ArrayList<>();private Select2MultiChoice<String> input;- @SuppressWarnings("unchecked")- public StringListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {+ public MultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {super(id, propertyDescriptor, propertyModel);-- io.onedev.server.util.editable.annotation.ChoiceProvider choiceProvider =- propertyDescriptor.getPropertyGetter().getAnnotation(- io.onedev.server.util.editable.annotation.ChoiceProvider.class);- Preconditions.checkNotNull(choiceProvider);- for (String each: (List<String>)ReflectionUtils- .invokeStaticMethod(propertyDescriptor.getBeanClass(), choiceProvider.value())) {- choices.add(each);- }}+ @SuppressWarnings({ "unchecked", "rawtypes" })@Overrideprotected void onInitialize() {super.onInitialize();+ OneContext oneContext = new ComponentContext(this);++ OneContext.push(oneContext);+ try {+ getPropertyDescriptor().getDependencyPropertyNames().clear();+ io.onedev.server.util.editable.annotation.ChoiceProvider choiceProvider =+ propertyDescriptor.getPropertyGetter().getAnnotation(+ io.onedev.server.util.editable.annotation.ChoiceProvider.class);+ Preconditions.checkNotNull(choiceProvider);+ for (String each: (List<String>)ReflectionUtils+ .invokeStaticMethod(propertyDescriptor.getBeanClass(), choiceProvider.value())) {+ choices.add(each);+ }+ } finally {+ OneContext.pop();+ }+Collection<String> selections = new ArrayList<>();if (getModelObject() != null) {for (String each: getModelObject())selections.add(each);}- @SuppressWarnings({ "unchecked", "rawtypes" })+IModel<Collection<String>> model = new Model((Serializable) selections);input = new Select2MultiChoice<String>("input", model, new ChoiceProvider<String>() {@@ -89,6 +101,15 @@ public class StringListPropertyEditor extends PropertyEditor<List<String>> {};+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(input);}diff --git a/web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.htmlrename to web/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.htmldiff --git a/web/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javanew file mode 100644index 0000000000..aede1ab8ff--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -0,0 +1,116 @@+package io.onedev.server.web.editable.choice;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import org.apache.commons.lang3.StringEscapeUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;+import org.json.JSONException;+import org.json.JSONWriter;++import com.google.common.base.Preconditions;++import io.onedev.server.util.OneContext;+import io.onedev.server.web.component.select2.ChoiceProvider;+import io.onedev.server.web.component.select2.Response;+import io.onedev.server.web.component.select2.Select2Choice;+import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;+import io.onedev.utils.ReflectionUtils;++@SuppressWarnings("serial")+public class SingleChoiceEditor extends PropertyEditor<String> {++ private List<String> choices = new ArrayList<>();++ private Select2Choice<String> input;++ public SingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @SuppressWarnings("unchecked")+ @Override+ protected void onInitialize() {+ super.onInitialize();++ OneContext oneContext = new ComponentContext(this);++ OneContext.push(oneContext);+ try {+ io.onedev.server.util.editable.annotation.ChoiceProvider choiceProvider =+ propertyDescriptor.getPropertyGetter().getAnnotation(+ io.onedev.server.util.editable.annotation.ChoiceProvider.class);+ Preconditions.checkNotNull(choiceProvider);+ for (String each: (List<String>)ReflectionUtils+ .invokeStaticMethod(propertyDescriptor.getBeanClass(), choiceProvider.value())) {+ choices.add(each);+ }+ } finally {+ OneContext.pop();+ }++ input = new Select2Choice<String>("input", Model.of(getModelObject()), new ChoiceProvider<String>() {++ @Override+ public void query(String term, int page, Response<String> response) {+ response.setResults(choices);+ response.setHasMore(false);+ }++ @Override+ public void toJson(String choice, JSONWriter writer) throws JSONException {+ writer.key("id").value(StringEscapeUtils.escapeHtml4(choice));+ }++ @Override+ public Collection<String> toChoices(Collection<String> ids) {+ return ids;+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().setPlaceholder("Select below...");+ getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");+ getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");++ setConvertEmptyInputStringToNull(true);+ }++ };++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });++ add(input);+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return input.getConvertedInput();+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.javaindex 630ab0fb6f..db094adade 100644--- a/web/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java@@ -1,15 +1,14 @@package io.onedev.server.web.editable.date;import java.util.Date;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -21,12 +20,7 @@ public class DateEditSupport implements EditSupport {public static final String DATE_INPUT_FORMAT = "yyyy-MM-dd";@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Class<?> propertyClass = propertyDescriptor.getPropertyGetter().getReturnType();@@ -42,7 +36,11 @@ public class DateEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new NotDefinedLabel(id);+ NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);+ if (nameOfEmptyValue != null)+ return new Label(id, nameOfEmptyValue.value());+ else+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.javaindex 1cdf58338b..a520dfd0fb 100644--- a/web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java@@ -4,6 +4,8 @@ import java.lang.reflect.Method;import java.util.Date;import org.apache.wicket.AttributeModifier;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.FormComponent;import org.apache.wicket.model.IModel;@@ -43,6 +45,15 @@ public class DatePropertyEditor extends PropertyEditor<Date> {if (propertyGetter.getAnnotation(OmitName.class) != null)input.add(AttributeModifier.replace("placeholder", EditableUtils.getName(propertyGetter)));+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(input);add(new AttributeAppender("class", new LoadableDetachableModel<String>() {diff --git a/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.javaindex 8b310a05db..7a1c8ab8b3 100644--- a/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java@@ -1,14 +1,11 @@package io.onedev.server.web.editable.enumeration;-import java.util.Set;-import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -18,12 +15,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class EnumEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);if (Enum.class.isAssignableFrom(propertyDescriptor.getPropertyClass())) {@@ -38,7 +30,7 @@ public class EnumEditSupport implements EditSupport {if (model.getObject() != null)return new Label(id, model.getObject().toString());else- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}};diff --git a/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex a380900299..629d8acf1c 100644--- a/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -7,6 +7,8 @@ import java.util.HashSet;import java.util.Iterator;import java.util.List;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.model.IModel;@@ -61,6 +63,15 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {input = new DropDownChoice<String>("input", Model.of(stringValue), choices);input.setNullValid(!getPropertyDescriptor().isPropertyRequired());+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(input);add(new AttributeAppender("class", new LoadableDetachableModel<String>() {diff --git a/web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.javanew file mode 100644index 0000000000..e2afb51ff7--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java@@ -0,0 +1,64 @@+package io.onedev.server.web.editable.enumlist;++import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class EnumListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);++ if (List.class.isAssignableFrom(propertyDescriptor.getPropertyClass())) {+ final Class<?> elementClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass != null && Enum.class.isAssignableFrom(elementClass)) {+ return new PropertyContext<List<Enum<?>>>(propertyDescriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Enum<?>>> model) {++ return new PropertyViewer(componentId, this) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null && !model.getObject().isEmpty()) {+ String content = "";+ for (Enum<?> each: model.getObject()) {+ if (content.length() == 0)+ content += each.toString();+ else+ content += ", " + each.toString();+ }+ return new Label(id, content);+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<Enum<?>>> renderForEdit(String componentId, IModel<List<Enum<?>>> model) {+ return new EnumListPropertyEditor(componentId, this, model);+ }++ };+ }+ }+ return null;+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.htmlnew file mode 100644index 0000000000..f1c90cbe9e--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden"></input>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javasimilarity index 92%rename from web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.javarename to web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex ab0a136441..fb9ba8b5ea 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.list;+package io.onedev.server.web.editable.enumlist;import java.io.Serializable;import java.util.ArrayList;@@ -9,6 +9,8 @@ import java.util.Iterator;import java.util.List;import org.apache.commons.lang3.StringEscapeUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -100,6 +102,15 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {};+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(new AttributeAppender("class", new LoadableDetachableModel<String>() {@Overridediff --git a/web/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.javaindex 1fb1422b08..d3c51cb680 100644--- a/web/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java@@ -1,16 +1,14 @@package io.onedev.server.web.editable.filechoice;import java.lang.reflect.Method;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.util.editable.annotation.FileChoice;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -20,12 +18,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class FileEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();FileChoice fileChoice = propertyGetter.getAnnotation(FileChoice.class);@@ -42,7 +35,7 @@ public class FileEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.javaindex 12f3ea1819..07d4a52be4 100644--- a/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java@@ -2,7 +2,6 @@ package io.onedev.server.web.editable.groupchoice;import java.lang.reflect.Method;import java.util.Collection;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;@@ -11,9 +10,8 @@ import org.eclipse.jgit.util.StringUtils;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.editable.annotation.GroupChoice;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -23,12 +21,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class GroupEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();if (propertyGetter.getAnnotation(GroupChoice.class) != null) {@@ -46,7 +39,7 @@ public class GroupEditSupport implements EditSupport {if (groupNames != null && !groupNames.isEmpty()) {return new Label(id, StringUtils.join(groupNames, ", " ));} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}@@ -72,7 +65,7 @@ public class GroupEditSupport implements EditSupport {if (groupName != null) {return new Label(id, groupName);} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex e7f62a10c9..45ee5cc0ef 100644--- a/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -5,13 +5,20 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;+import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.GroupManager;import io.onedev.server.model.Group;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.GroupChoice;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupMultiChoice;@@ -19,10 +26,14 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;+import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {+ private final List<GroupFacade> choices = new ArrayList<>();+private GroupMultiChoice input;public GroupMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Collection<String>> propertyModel) {@@ -34,6 +45,22 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {protected void onInitialize() {super.onInitialize();+ OneContext oneContext = new ComponentContext(this);++ OneContext.push(oneContext);+ try {+ GroupChoice groupChoice = propertyDescriptor.getPropertyGetter().getAnnotation(GroupChoice.class);+ Preconditions.checkNotNull(groupChoice);+ if (groupChoice.value().length() != 0) {+ choices.addAll((List<GroupFacade>)ReflectionUtils+ .invokeStaticMethod(propertyDescriptor.getBeanClass(), groupChoice.value()));+ } else {+ choices.addAll(OneDev.getInstance(CacheManager.class).getGroups().values());+ }+ } finally {+ OneContext.pop();+ }+List<GroupFacade> groups = new ArrayList<>();if (getModelObject() != null) {GroupManager groupManager = OneDev.getInstance(GroupManager.class);@@ -44,9 +71,18 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {}}- input = new GroupMultiChoice("input", new Model((Serializable)groups), new GroupChoiceProvider());+ input = new GroupMultiChoice("input", new Model((Serializable)groups), new GroupChoiceProvider(choices));input.setConvertEmptyInputStringToNull(true);+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(input);}diff --git a/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 7ec7cd0d79..f853dee552 100644--- a/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -1,12 +1,22 @@package io.onedev.server.web.editable.groupchoice;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;+import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.GroupManager;import io.onedev.server.model.Group;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.editable.annotation.GroupChoice;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupSingleChoice;@@ -14,20 +24,41 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;+import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")public class GroupSingleChoiceEditor extends PropertyEditor<String> {+ private final List<GroupFacade> choices = new ArrayList<>();+private GroupSingleChoice input;public GroupSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {super(id, propertyDescriptor, propertyModel);}+ @SuppressWarnings("unchecked")@Overrideprotected void onInitialize() {super.onInitialize();+ OneContext oneContext = new ComponentContext(this);++ OneContext.push(oneContext);+ try {+ GroupChoice groupChoice = propertyDescriptor.getPropertyGetter().getAnnotation(GroupChoice.class);+ Preconditions.checkNotNull(groupChoice);+ if (groupChoice.value().length() != 0) {+ choices.addAll((List<GroupFacade>)ReflectionUtils+ .invokeStaticMethod(propertyDescriptor.getBeanClass(), groupChoice.value()));+ } else {+ choices.addAll(OneDev.getInstance(CacheManager.class).getGroups().values());+ }+ } finally {+ OneContext.pop();+ }+Group group;if (getModelObject() != null)group = OneDev.getInstance(GroupManager.class).find(getModelObject());@@ -35,12 +66,21 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {group = null;GroupFacade facade = group!=null?group.getFacade():null;- input = new GroupSingleChoice("input", Model.of(facade), new GroupChoiceProvider());+ input = new GroupSingleChoice("input", Model.of(facade), new GroupChoiceProvider(choices));input.setConvertEmptyInputStringToNull(true);// add this to control allowClear flag of select2input.setRequired(propertyDescriptor.isPropertyRequired());+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(input);}diff --git a/web/src/main/java/io/onedev/server/web/editable/list/ListEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/list/ListEditSupport.javadeleted file mode 100644index cc2ae00650..0000000000--- a/web/src/main/java/io/onedev/server/web/editable/list/ListEditSupport.java+++ /dev/null@@ -1,167 +0,0 @@-package io.onedev.server.web.editable.list;--import java.io.Serializable;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.IModel;--import io.onedev.server.util.editable.EditableUtils;-import io.onedev.server.util.editable.annotation.ChoiceProvider;-import io.onedev.server.util.editable.annotation.Editable;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.web.editable.list.concrete.ConcreteListPropertyEditor;-import io.onedev.server.web.editable.list.concrete.ConcreteListPropertyViewer;-import io.onedev.server.web.editable.list.polymorphic.PolymorphicListPropertyEditor;-import io.onedev.server.web.editable.list.polymorphic.PolymorphicListPropertyViewer;-import io.onedev.utils.ClassUtils;--@SuppressWarnings("serial")-public class ListEditSupport implements EditSupport {-- @Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);-- if (List.class.isAssignableFrom(propertyDescriptor.getPropertyClass())) {- final Class<?> elementClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());- if (elementClass != null) {- if (Enum.class.isAssignableFrom(elementClass)) {- return new PropertyContext<List<Enum<?>>>(propertyDescriptor) {-- @Override- public PropertyViewer renderForView(String componentId, final IModel<List<Enum<?>>> model) {-- return new PropertyViewer(componentId, this) {-- @Override- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null && !model.getObject().isEmpty()) {- String content = "";- for (Enum<?> each: model.getObject()) {- if (content.length() == 0)- content += each.toString();- else- content += ", " + each.toString();- }- return new Label(id, content);- } else {- return new NotDefinedLabel(id);- }- }-- };- }-- @Override- public PropertyEditor<List<Enum<?>>> renderForEdit(String componentId, IModel<List<Enum<?>>> model) {- return new EnumListPropertyEditor(componentId, this, model);- }-- };- } else if (elementClass == String.class- && propertyDescriptor.getPropertyGetter().getAnnotation(ChoiceProvider.class) != null) {- return new PropertyContext<List<String>>(propertyDescriptor) {-- @Override- public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {-- return new PropertyViewer(componentId, this) {-- @Override- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null && !model.getObject().isEmpty()) {- String content = "";- for (String each: model.getObject()) {- if (content.length() == 0)- content += each.toString();- else- content += ", " + each.toString();- }- return new Label(id, content);- } else {- return new NotDefinedLabel(id);- }- }-- };- }-- @Override- public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {- return new StringListPropertyEditor(componentId, this, model);- }-- };- } else if (ClassUtils.isConcrete(elementClass)) {- if (elementClass.getAnnotation(Editable.class) != null) {- return new PropertyContext<List<Serializable>>(propertyDescriptor) {-- @Override- public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {- return new PropertyViewer(componentId, this) {-- @Override- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null) {- return new ConcreteListPropertyViewer(id, elementClass, model.getObject());- } else {- return new NotDefinedLabel(id);- }- }-- };- }-- @Override- public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new ConcreteListPropertyEditor(componentId, this, model);- }-- };- }- } else if (elementClass.getAnnotation(Editable.class) != null) {- return new PropertyContext<List<Serializable>>(propertyDescriptor) {-- @Override- public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {- return new PropertyViewer(componentId, this) {-- @Override- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null) {- return new PolymorphicListPropertyViewer(id, propertyDescriptor, model.getObject());- } else {- return new NotDefinedLabel(id);- }- }-- };- }-- @Override- public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new PolymorphicListPropertyEditor(componentId, this, model);- }-- };- }- }- }- return null;- }--}diff --git a/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownEditSupport.javanew file mode 100644index 0000000000..a1b4f1600f--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownEditSupport.java@@ -0,0 +1,51 @@+package io.onedev.server.web.editable.markdown;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import io.onedev.server.util.editable.annotation.Markdown;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class MarkdownEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);++ Class<?> propertyClass = propertyDescriptor.getPropertyGetter().getReturnType();+ if (propertyClass == String.class+ && propertyDescriptor.getPropertyGetter().getAnnotation(Markdown.class) != null) {+ return new PropertyContext<String>(propertyDescriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, this) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ return new MarkdownViewer(id, Model.of(model.getObject()), null);+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new MarkdownPropertyEditor(componentId, this, model);+ }++ };+ } else {+ return null;+ }++ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.htmlnew file mode 100644index 0000000000..a3fb69a967--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <div wicket:id="input"></div>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.javanew file mode 100644index 0000000000..972c8b2802--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java@@ -0,0 +1,54 @@+package io.onedev.server.web.editable.markdown;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.form.FormComponent;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.web.component.markdown.MarkdownEditor;+import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class MarkdownPropertyEditor extends PropertyEditor<String> {++ private FormComponent<String> input;++ public MarkdownPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(input = new MarkdownEditor("input", Model.of(getModelObject()), false, null));++ add(new AttributeAppender("class", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (hasErrors(true))+ return " has-error";+ else+ return "";+ }++ }));+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return input.getConvertedInput();+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.javaindex 7e8985514e..04544b7488 100644--- a/web/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java@@ -1,14 +1,11 @@package io.onedev.server.web.editable.numeric;-import java.util.Set;-import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -18,12 +15,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class NumericEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Class<?> propertyClass = propertyDescriptor.getPropertyGetter().getReturnType();@@ -40,7 +32,7 @@ public class NumericEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject().toString());} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.javaindex 3ca74a4aab..e06940be5a 100644--- a/web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.numeric;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.model.IModel;@@ -29,6 +31,15 @@ public class NumericPropertyEditor extends PropertyEditor<Number> {input.setType(getPropertyDescriptor().getPropertyClass());add(input);+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(new AttributeAppender("class", new LoadableDetachableModel<String>() {@Overridediff --git a/web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.javaindex 3a4c9ebf14..cec6126550 100644--- a/web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java@@ -7,11 +7,12 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.util.editable.annotation.Password;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.utils.StringUtils;@SuppressWarnings("serial")public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {@@ -38,10 +39,11 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {inputAgain.setRequired(false);add(inputAgain);- String autocomplete = EditableUtils.getAutocomplete(getPropertyDescriptor().getPropertyGetter());- if (autocomplete != null) {- input.add(AttributeAppender.append("autocomplete", autocomplete));- inputAgain.add(AttributeAppender.append("autocomplete", autocomplete));+ Password password = getPropertyDescriptor().getPropertyGetter().getAnnotation(Password.class);+ String autoComplete = password.autoComplete();+ if (StringUtils.isNotBlank(autoComplete)) {+ input.add(AttributeAppender.append("autocomplete", autoComplete));+ inputAgain.add(AttributeAppender.append("autocomplete", autoComplete));}add(new AttributeAppender("class", new LoadableDetachableModel<String>() {diff --git a/web/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.javaindex 189c0eb1fb..daa8ce0cdb 100644--- a/web/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java@@ -1,15 +1,12 @@package io.onedev.server.web.editable.password;-import java.util.Set;-import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.util.editable.annotation.Password;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -19,12 +16,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class PasswordEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);if (propertyDescriptor.getPropertyClass() == String.class) {Password password = propertyDescriptor.getPropertyGetter().getAnnotation(Password.class);@@ -41,7 +33,7 @@ public class PasswordEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, "******");} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}@@ -66,7 +58,7 @@ public class PasswordEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, "******");} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.javaindex a3e2ba30d4..862061ad51 100644--- a/web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java@@ -7,11 +7,12 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.util.editable.annotation.Password;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.utils.StringUtils;@SuppressWarnings("serial")public class PasswordPropertyEditor extends PropertyEditor<String> {@@ -31,9 +32,10 @@ public class PasswordPropertyEditor extends PropertyEditor<String> {input.setResetPassword(false);add(input);- String autocomplete = EditableUtils.getAutocomplete(getPropertyDescriptor().getPropertyGetter());- if (autocomplete != null)- input.add(AttributeAppender.append("autocomplete", autocomplete));+ Password password = getPropertyDescriptor().getPropertyGetter().getAnnotation(Password.class);+ String autoComplete = password.autoComplete();+ if (StringUtils.isNotBlank(autoComplete))+ input.add(AttributeAppender.append("autocomplete", autoComplete));add(new AttributeAppender("class", new LoadableDetachableModel<String>() {diff --git a/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.javaindex bb27a8c392..bee5c171be 100644--- a/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java@@ -1,16 +1,14 @@package io.onedev.server.web.editable.pathpattern;import java.lang.reflect.Method;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.util.editable.annotation.PathPattern;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -20,12 +18,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class PathPatternEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();if (propertyGetter.getAnnotation(PathPattern.class) != null) {@@ -45,7 +38,7 @@ public class PathPatternEditSupport implements EditSupport {if (refMatch != null) {return new Label(id, refMatch);} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.javaindex 08a4a5cd90..3d041724e1 100644--- a/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java+++ b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java@@ -1,15 +1,13 @@package io.onedev.server.web.editable.polymorphic;import java.io.Serializable;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.server.util.editable.annotation.Editable;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -20,12 +18,7 @@ import io.onedev.utils.ClassUtils;public class PolymorphicEditSuport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptpr = new PropertyDescriptor(beanClass, propertyName);Class<?> propertyClass = propertyDescriptpr.getPropertyClass();if (propertyClass.getAnnotation(Editable.class) != null && !ClassUtils.isConcrete(propertyClass)) {@@ -37,10 +30,11 @@ public class PolymorphicEditSuport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null)+ if (model.getObject() != null) {return new PolymorphicPropertyViewer(id, propertyDescriptor, model.getObject());- else- return new NotDefinedLabel(id);+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }}};diff --git a/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex 23dc2e2bc9..a325d78f17 100644--- a/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -5,11 +5,12 @@ import java.lang.reflect.Method;import java.util.ArrayList;import java.util.List;+import org.apache.wicket.Application;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.panel.Fragment;@@ -23,11 +24,11 @@ import io.onedev.launcher.loader.AppLoader;import io.onedev.launcher.loader.ImplementationRegistry;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.editable.annotation.Horizontal;-import io.onedev.server.util.editable.annotation.NullChoice;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.util.editable.annotation.Vertical;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.EditorChanged;+import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;@@ -66,6 +67,12 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {vertical = true;}+ private String getName(Class<?> clazz) {+ String name = EditableUtils.getName(clazz);+ name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);+ return name;+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -82,7 +89,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {List<String> implementationNames = new ArrayList<String>();for (Class<?> each: implementations)- implementationNames.add(EditableUtils.getName(each));+ implementationNames.add(getName(each));WebMarkupContainer typeSelectorContainer = new WebMarkupContainer("typeSelectorContainer");typeSelectorContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {@@ -109,7 +116,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {public String getObject() {Component beanEditor = fragment.get(BEAN_EDITOR_ID);if (beanEditor instanceof BeanEditor) {- return EditableUtils.getName(((BeanEditor<?>) beanEditor).getBeanDescriptor().getBeanClass());+ return EditableUtils.getName(((BeanEditor) beanEditor).getBeanDescriptor().getBeanClass());} else {return null;}@@ -119,7 +126,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {public void setObject(String object) {Serializable propertyValue = null;for (Class<?> each: implementations) {- if (EditableUtils.getName(each).equals(object)) {+ if (getName(each).equals(object)) {try {propertyValue = (Serializable) each.newInstance();} catch (InstantiationException | IllegalAccessException e) {@@ -135,9 +142,9 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@Overrideprotected String getNullValidDisplayValue() {- NullChoice nullChoice = getPropertyDescriptor().getPropertyGetter().getAnnotation(NullChoice.class);- if (nullChoice != null)- return nullChoice.value();+ NameOfEmptyValue nameOfEmptyValue = getPropertyDescriptor().getPropertyGetter().getAnnotation(NameOfEmptyValue.class);+ if (nameOfEmptyValue != null)+ return nameOfEmptyValue.value();elsereturn super.getNullValidDisplayValue();}@@ -145,11 +152,12 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {};typeSelector.setNullValid(!getPropertyDescriptor().isPropertyRequired());+typeSelector.add(new AjaxFormComponentUpdatingBehavior("change"){@Overrideprotected void onUpdate(AjaxRequestTarget target) {- send(PolymorphicPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));+ onPropertyUpdating(target);target.add(fragment.get(BEAN_EDITOR_ID));}@@ -159,6 +167,16 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {fragment.add(newBeanEditor(getModelObject()));}+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof BeanUpdating) {+ event.stop();+ onPropertyUpdating(((BeanUpdating)event.getPayload()).getHandler());+ }+ }+private Component newBeanEditor(Serializable propertyValue) {Component beanEditor;if (propertyValue != null) {@@ -176,15 +194,13 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {return ((ErrorContext) fragment.get(BEAN_EDITOR_ID)).getErrorContext(pathSegment);}- @SuppressWarnings("unchecked")@Overrideprotected Serializable convertInputToValue() throws ConversionException {Component beanEditor = fragment.get(BEAN_EDITOR_ID);- if (beanEditor instanceof BeanEditor) {- return ((BeanEditor<Serializable>) beanEditor).getConvertedInput();- } else {+ if (beanEditor instanceof BeanEditor)+ return ((BeanEditor) beanEditor).getConvertedInput();+ elsereturn null;- }}}diff --git a/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.javaindex e35849221c..eb69ca45f9 100644--- a/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java+++ b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java@@ -3,6 +3,7 @@ package io.onedev.server.web.editable.polymorphic;import java.io.Serializable;import java.lang.reflect.Method;+import org.apache.wicket.Application;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;@@ -49,7 +50,10 @@ public class PolymorphicPropertyViewer extends Panel {fragment.add(AttributeAppender.append("class", " horizontal"));add(fragment);- fragment.add(new Label("type", EditableUtils.getName(propertyValue.getClass())));+ String name = EditableUtils.getName(propertyValue.getClass());+ name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);++ fragment.add(new Label("type", name));fragment.add(BeanContext.viewBean("beanViewer", propertyValue));}diff --git a/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.javanew file mode 100644index 0000000000..431e157031--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java@@ -0,0 +1,59 @@+package io.onedev.server.web.editable.polymorphiclist;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;+import io.onedev.utils.ClassUtils;++@SuppressWarnings("serial")+public class PolymorphicListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);++ if (List.class.isAssignableFrom(propertyDescriptor.getPropertyClass())) {+ final Class<?> elementClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass != null && !ClassUtils.isConcrete(elementClass)+ && elementClass.getAnnotation(Editable.class) != null) {+ return new PropertyContext<List<Serializable>>(propertyDescriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {+ return new PropertyViewer(componentId, this) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new PolymorphicListPropertyViewer(id, propertyDescriptor, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {+ return new PolymorphicListPropertyEditor(componentId, this, model);+ }++ };+ }+ }+ return null;+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.htmlsimilarity index 93%rename from web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.htmlrename to web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.htmlindex e6f4afc073..a642f5ac75 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html+++ b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html@@ -13,7 +13,7 @@</tbody><tfoot><tr class="add-element">- <td colspan="3"><a wicket:id="addElement" title="Add new element"><span class="add icon"></span></a></td>+ <td colspan="3"><a wicket:id="addElement" title="Add new element" class="btn btn-default"><span class="fa fa-plus-circle add"></span> Add Item</a></td></tr></tfoot></table>diff --git a/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javasimilarity index 90%rename from web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.javarename to web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javaindex 5601a3642f..a7d9bc6bf6 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.list.polymorphic;+package io.onedev.server.web.editable.polymorphiclist;import static de.agilecoders.wicket.jquery.JQuery.$;@@ -8,12 +8,13 @@ import java.util.ArrayList;import java.util.Iterator;import java.util.List;+import org.apache.wicket.Application;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.CheckBox;@@ -24,6 +25,8 @@ import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.base.Preconditions;+import io.onedev.launcher.loader.AppLoader;import io.onedev.launcher.loader.ImplementationRegistry;import io.onedev.server.util.editable.EditableUtils;@@ -33,15 +36,13 @@ import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.EditorChanged;+import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.utils.ClassUtils;-import com.google.common.base.Preconditions;-@SuppressWarnings("serial")public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializable>> {@@ -87,6 +88,12 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa}}+ private String getName(Class<?> clazz) {+ String name = EditableUtils.getName(clazz);+ name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);+ return name;+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -115,7 +122,6 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa@Overrideprotected void onUpdate(AjaxRequestTarget target) {- send(PolymorphicListPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));target.add(PolymorphicListPropertyEditor.this.get("listEditor"));}@@ -195,7 +201,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializaif (rows.size() == 1)target.add(noElements);- send(PolymorphicListPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));+ onPropertyUpdating(target);}}.setDefaultFormProcessing(false));@@ -229,7 +235,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializafor (int i=0; i<fromIndex-toIndex; i++)rows.swap(fromIndex-i, fromIndex-i-1);}- send(PolymorphicListPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));+ onPropertyUpdating(target);}}.sortable("tbody").handle(".handle").helperClass("sort-helper"));@@ -247,8 +253,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializarows.add(row);List<String> implementationNames = new ArrayList<String>();- for (Class<?> each: implementations)- implementationNames.add(EditableUtils.getName(each));+ for (Class<?> each: implementations)+ implementationNames.add(getName(each));row.add(new DropDownChoice<String>("elementTypeSelector", new IModel<String>() {@@ -260,7 +266,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializapublic String getObject() {Component elementEditor = row.get("elementEditor");if (elementEditor.isVisible()) {- return EditableUtils.getName(((BeanEditor<?>) elementEditor).getBeanDescriptor().getBeanClass());+ return EditableUtils.getName(((BeanEditor) elementEditor).getBeanDescriptor().getBeanClass());} else {return null;}@@ -269,7 +275,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa@Overridepublic void setObject(String object) {for (Class<?> each: implementations) {- if (EditableUtils.getName(each).equals(object)) {+ if (getName(each).equals(object)) {Serializable element;try {element = (Serializable) each.newInstance();@@ -283,12 +289,12 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializathrow new IllegalStateException("Unable to find implementation named " + object);}-}, implementationNames).setNullValid(false).add(new AjaxFormComponentUpdatingBehavior("change"){@Overrideprotected void onUpdate(AjaxRequestTarget target) {target.add(row.get("elementEditor"));+ onPropertyUpdating(target);}}));@@ -304,6 +310,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializaprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);+ target.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId(true)));target.appendJavaScript($(row).chain("remove").get());rows.remove(row);@@ -311,7 +318,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<SerializaWebMarkupContainer table = (WebMarkupContainer) PolymorphicListPropertyEditor.this.get("listEditor");target.add(table.get("noElements"));}- send(PolymorphicListPropertyEditor.this, Broadcast.BUBBLE, new EditorChanged(target));+ onPropertyUpdating(target);}}.setDefaultFormProcessing(false));@@ -319,6 +326,16 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializareturn row;}+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof BeanUpdating) {+ event.stop();+ onPropertyUpdating(((BeanUpdating)event.getPayload()).getHandler());+ }+ }+private Component newElementEditor(Serializable element) {Component elementEditor;if (element != null) {@@ -353,8 +370,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<SerializaList<Serializable> newList = newList();RepeatingView rows = (RepeatingView) get("listEditor").get("elements");for (Component row: rows) {- @SuppressWarnings("unchecked")- BeanEditor<Serializable> elementEditor = (BeanEditor<Serializable>) row.get("elementEditor");+ BeanEditor elementEditor = (BeanEditor) row.get("elementEditor");newList.add(elementEditor.getConvertedInput());}return newList;diff --git a/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.htmlrename to web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.htmldiff --git a/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.javasimilarity index 87%rename from web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.javarename to web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.javaindex 719970e423..1cb9762037 100644--- a/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java+++ b/web/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java@@ -1,9 +1,10 @@-package io.onedev.server.web.editable.list.polymorphic;+package io.onedev.server.web.editable.polymorphiclist;import java.io.Serializable;import java.lang.reflect.Method;import java.util.List;+import org.apache.wicket.Application;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;@@ -60,7 +61,9 @@ public class PolymorphicListPropertyViewer extends Panel {fragment = new Fragment("content", "verticalFrag", PolymorphicListPropertyViewer.this);item.add(fragment);- fragment.add(new Label("elementType", EditableUtils.getName(item.getModelObject().getClass())));+ String name = EditableUtils.getName(item.getModelObject().getClass());+ name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);+ fragment.add(new Label("elementType", name));fragment.add(BeanContext.viewBean("element", item.getModelObject()));}diff --git a/web/src/main/java/io/onedev/server/web/editable/property-container.js b/web/src/main/java/io/onedev/server/web/editable/property-container.jsnew file mode 100644index 0000000000..f23963ba50--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/property-container.js@@ -0,0 +1,12 @@+onedev.server.propertyContainer = {+ onDomReady: function(containerId) {+ var $container = $("#" + containerId);+ var input = $container.find(".value>input[type=checkbox]");+ input.parent().prev("label.name").addClass("pull-left");+ input.after("<div style='clear:both;'/>")++ input = $container.find(".value>div>input[type=checkbox]");+ input.parent().parent().prev("label.name").addClass("pull-left");+ input.after("<div style='clear:both;'/>")+ }+}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.java b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.javadeleted file mode 100644index 7c12d762a8..0000000000--- a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.java+++ /dev/null@@ -1,151 +0,0 @@-package io.onedev.server.web.editable.reflection;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.head.IHeaderResponse;-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.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;-import org.apache.wicket.util.visit.IVisit;-import org.apache.wicket.util.visit.IVisitor;--import io.onedev.server.util.editable.EditableUtils;-import io.onedev.server.util.editable.annotation.Horizontal;-import io.onedev.server.util.editable.annotation.OmitName;-import io.onedev.server.util.editable.annotation.Vertical;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PathSegment.Property;--@SuppressWarnings("serial")-public class ReflectionBeanEditor extends BeanEditor<Serializable> {-- private final List<PropertyContext<Serializable>> propertyContexts = new ArrayList<>();-- private final boolean vertical;-- public ReflectionBeanEditor(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {- super(id, beanDescriptor, model);-- for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {- propertyContexts.add(PropertyContext.of(propertyDescriptor));- }-- Class<?> beanClass = beanDescriptor.getBeanClass();- if (beanClass.getAnnotation(Vertical.class) != null)- vertical = true;- else if (beanClass.getAnnotation(Horizontal.class) != null)- vertical = false;- else- vertical = true;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setOutputMarkupId(true);-- Fragment fragment;- if (vertical) {- fragment = new Fragment("content", "verticalFrag", ReflectionBeanEditor.this);- fragment.add(AttributeAppender.append("class", " vertical"));- } else {- fragment = new Fragment("content", "horizontalFrag", ReflectionBeanEditor.this);- fragment.add(AttributeAppender.append("class", " horizontal"));- }-- add(fragment);-- RepeatingView propertiesView = new RepeatingView("properties");- fragment.add(propertiesView);-- for (PropertyContext<Serializable> propertyContext: propertyContexts) {- WebMarkupContainer item = new WebMarkupContainer(propertiesView.newChildId());- propertiesView.add(item);- Label nameLabel = new Label("name", EditableUtils.getName(propertyContext.getPropertyGetter()));- item.add(nameLabel);-- OmitName omitName = propertyContext.getPropertyGetter().getAnnotation(OmitName.class);- if (omitName != null && omitName.value() != OmitName.Place.VIEWER)- nameLabel.setVisible(false);-- String required;- if (propertyContext.isPropertyRequired() && propertyContext.getPropertyClass() != boolean.class- && propertyContext.getPropertyClass() != List.class) {- required = "*";- } else {- required = " ";- }-- item.add(new Label("required", required).setEscapeModelStrings(false));-- Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(ReflectionBeanEditor.this.getModelObject());- PropertyEditor<Serializable> propertyEditor = propertyContext.renderForEdit("value", Model.of(propertyValue));- item.add(propertyEditor);-- String description = EditableUtils.getDescription(propertyContext.getPropertyGetter());- if (description != null)- item.add(new Label("description", description).setEscapeModelStrings(false));- else- item.add(new Label("description").setVisible(false));-- item.add(new FencedFeedbackPanel("feedback", propertyEditor));- }-- }-- @Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- final PathSegment.Property property = (Property) pathSegment;- return visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {-- @Override- public void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {- if (object.getPropertyDescriptor().getPropertyName().equals(property.getName()))- visit.stop(object);- else- visit.dontGoDeeper();- }-- });- }-- @Override- protected Serializable convertInputToValue() throws ConversionException {- final Serializable bean = (Serializable) getBeanDescriptor().newBeanInstance();-- visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {-- @Override- public void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {- object.getPropertyDescriptor().setPropertyValue(bean, object.getConvertedInput());- visit.dontGoDeeper();- }-- });-- return bean;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(OnDomReadyHeaderItem.forScript(String.format("onedev.server.editable.adjustReflectionEditor('%s')", getMarkupId())));- }-}diff --git a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.html b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.htmldeleted file mode 100644index 41d2b09185..0000000000--- a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="reflection properties">- <table>- <tr wicket:id="properties">- <wicket:enclosure child="name">- <td class="name"><span wicket:id="name"></span></td>- </wicket:enclosure>- <td class="value"><div wicket:id="value"></div></td>- </tr>- </table>- </div>-</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.java b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.javadeleted file mode 100644index 666bf53a18..0000000000--- a/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.java+++ /dev/null@@ -1,61 +0,0 @@-package io.onedev.server.web.editable.reflection;--import java.io.Serializable;-import java.lang.reflect.Method;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;--import io.onedev.server.util.editable.EditableUtils;-import io.onedev.server.util.editable.annotation.OmitName;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyDescriptor;--@SuppressWarnings("serial")-public class ReflectionBeanViewer extends Panel {-- private final List<PropertyContext<Serializable>> propertyContexts = new ArrayList<>();-- public ReflectionBeanViewer(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {- super(id, model);-- for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {- propertyContexts.add(PropertyContext.of(propertyDescriptor));- }- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ListView<PropertyContext<Serializable>>("properties", propertyContexts) {-- @Override- protected void populateItem(ListItem<PropertyContext<Serializable>> item) {- PropertyContext<Serializable> propertyContext = item.getModelObject();- Method propertyGetter = propertyContext.getPropertyGetter();- Label nameLabel = new Label("name", EditableUtils.getName(propertyGetter));- item.add(nameLabel);- OmitName omitName = propertyGetter.getAnnotation(OmitName.class);-- if (omitName != null && omitName.value() != OmitName.Place.EDITOR) {- nameLabel.setVisible(false);- item.add(AttributeAppender.append("class", "name-omitted"));- }-- Serializable bean = (Serializable) ReflectionBeanViewer.this.getDefaultModelObject();- Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(bean);- item.add(propertyContext.renderForView("value", Model.of(propertyValue)));- }-- });- }-}diff --git a/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.javaindex f8948de29e..4231c6ef56 100644--- a/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java@@ -1,16 +1,14 @@package io.onedev.server.web.editable.reviewrequirementspec;import java.lang.reflect.Method;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.util.editable.annotation.ReviewRequirementSpec;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -20,12 +18,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class ReviewRequirementSpecEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();if (propertyGetter.getAnnotation(ReviewRequirementSpec.class) != null) {@@ -45,7 +38,7 @@ public class ReviewRequirementSpecEditSupport implements EditSupport {if (expr != null) {return new Label(id, expr);} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.javanew file mode 100644index 0000000000..a3943dcdc5--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java@@ -0,0 +1,56 @@+package io.onedev.server.web.editable.script;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import com.google.common.base.Preconditions;++import io.onedev.server.util.editable.annotation.Script;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class ScriptEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);++ Class<?> propertyClass = propertyDescriptor.getPropertyGetter().getReturnType();+ if (propertyDescriptor.getPropertyGetter().getAnnotation(Script.class) != null) {+ Preconditions.checkState(propertyClass == String.class,+ "@Code annotation should only be applied to a string property");+ return new PropertyContext<String>(propertyDescriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, this) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new ScriptPropertyViewer(id, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new ScriptPropertyEditor(componentId, this, model);+ }++ };+ } else {+ return null;+ }+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.htmlnew file mode 100644index 0000000000..fa28cd1f80--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.html@@ -0,0 +1,5 @@+<wicket:panel>+ <div wicket:id="container" class="script-support autofocus">+ <textarea wicket:id="input"></textarea>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.javanew file mode 100644index 0000000000..7d976f3a00--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java@@ -0,0 +1,70 @@+package io.onedev.server.web.editable.script;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.TextArea;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class ScriptPropertyEditor extends PropertyEditor<String> {++ private TextArea<String> input;++ public ScriptPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebMarkupContainer container = new WebMarkupContainer("container");+ add(container);++ container.add(input = new TextArea<String>("input", Model.of(getModelObject())));+ input.setOutputMarkupId(true);++ container.add(new AttributeAppender("class", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (hasErrors(true))+ return " has-error";+ else+ return "";+ }++ }));+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return input.getConvertedInput();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new ScriptSupportResourceReference()));++ String script = String.format("onedev.server.scriptSupport.onEditorDomReady('%s');", input.getMarkupId());+ response.render(OnLoadHeaderItem.forScript(script));+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.html b/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.htmlnew file mode 100644index 0000000000..2496116c6c--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.html@@ -0,0 +1,5 @@+<wicket:panel>+ <div class="script-support">+ <textarea wicket:id="input"></textarea>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.java b/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.javanew file mode 100644index 0000000000..26d59f2c7f--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.java@@ -0,0 +1,42 @@+package io.onedev.server.web.editable.script;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;+import org.apache.wicket.markup.html.form.TextArea;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.Model;++@SuppressWarnings("serial")+public class ScriptPropertyViewer extends Panel {++ private final String script;++ private TextArea<String> input;++ public ScriptPropertyViewer(String id, String script) {+ super(id);++ this.script = script;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ input = new TextArea<>("input", Model.of(script));+ add(input);++ input.setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new ScriptSupportResourceReference()));++ String script = String.format("onedev.server.scriptSupport.onViewerDomReady('%s');", input.getMarkupId());+ response.render(OnLoadHeaderItem.forScript(script));+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/script/ScriptSupportResourceReference.java b/web/src/main/java/io/onedev/server/web/editable/script/ScriptSupportResourceReference.javanew file mode 100644index 0000000000..119184a447--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/script/ScriptSupportResourceReference.java@@ -0,0 +1,29 @@+package io.onedev.server.web.editable.script;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference;+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class ScriptSupportResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public ScriptSupportResourceReference() {+ super(ScriptSupportResourceReference.class, "script-support.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(ScriptSupportResourceReference.class, "script-support.css")));+ return dependencies;+ }++}diff --git a/web/src/main/java/io/onedev/server/web/editable/script/script-support.css b/web/src/main/java/io/onedev/server/web/editable/script/script-support.cssnew file mode 100644index 0000000000..a0eef97504--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/script/script-support.css@@ -0,0 +1,17 @@+.script-support {+ border: 1px solid #E0E0E0;+ border-radius: 4px;+ padding: 1px;+}+.script-support.has-error {+ border-color: #a94442;+}+.script-support .CodeMirror {+ height: 500px;+}+.property.viewer .script-support .CodeMirror {+ height: auto;+}+.property.viewer .CodeMirror .CodeMirror-cursor {+ border-left: none;+}diff --git a/web/src/main/java/io/onedev/server/web/editable/script/script-support.js b/web/src/main/java/io/onedev/server/web/editable/script/script-support.jsnew file mode 100644index 0000000000..7dedfb8276--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/editable/script/script-support.js@@ -0,0 +1,43 @@+onedev.server.scriptSupport = {+ onEditorDomReady: function(inputId) {+ var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {+ indentWithTabs: true,+ indentUnit: 4,+ tabSize: 4,+ theme: "eclipse",+ lineNumbers: true,+ styleActiveLine: true,+ styleSelectedText: true,+ foldGutter: true,+ matchBrackets: true,+ scrollbarStyle: "simple",+ gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],+ highlightIdentifiers: {delay: 500}+ });+ onedev.server.codemirror.setMode(cm, ".groovy");++ var $input = $("#" + inputId);+ cm.on("change", function() {+ cm.save();+ onedev.server.form.markDirty($input.closest("form"));+ });+ },+ onViewerDomReady: function(inputId) {+ var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {+ readOnly: true,+ indentWithTabs: true,+ indentUnit: 4,+ tabSize: 4,+ theme: "eclipse",+ lineNumbers: true,+ lineWrapping: true,+ styleActiveLine: true,+ styleSelectedText: true,+ foldGutter: true,+ matchBrackets: true,+ gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],+ highlightIdentifiers: {delay: 500}+ });+ onedev.server.codemirror.setMode(cm, ".groovy");+ }+}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.javaindex 0e15d434f7..cd8c493a9e 100644--- a/web/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java@@ -1,13 +1,12 @@package io.onedev.server.web.editable.string;-import java.util.Set;-import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;import io.onedev.server.util.editable.annotation.BranchPattern;+import io.onedev.server.util.editable.annotation.ChoiceProvider;+import io.onedev.server.util.editable.annotation.Script;import io.onedev.server.util.editable.annotation.GroupChoice;import io.onedev.server.util.editable.annotation.Markdown;import io.onedev.server.util.editable.annotation.Multiline;@@ -17,10 +16,8 @@ import io.onedev.server.util.editable.annotation.ReviewRequirementSpec;import io.onedev.server.util.editable.annotation.TagPattern;import io.onedev.server.util.editable.annotation.UserChoice;import io.onedev.server.web.component.MultilineLabel;-import io.onedev.server.web.component.markdown.MarkdownViewer;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -30,16 +27,14 @@ import io.onedev.server.web.editable.PropertyViewer;public class StringEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Class<?> propertyClass = propertyDescriptor.getPropertyGetter().getReturnType();if (propertyClass == String.class+ && propertyDescriptor.getPropertyGetter().getAnnotation(ChoiceProvider.class) == null+ && propertyDescriptor.getPropertyGetter().getAnnotation(Markdown.class) == null+ && propertyDescriptor.getPropertyGetter().getAnnotation(Script.class) == null&& propertyDescriptor.getPropertyGetter().getAnnotation(Password.class) == null&& propertyDescriptor.getPropertyGetter().getAnnotation(BranchPattern.class) == null&& propertyDescriptor.getPropertyGetter().getAnnotation(TagPattern.class) == null@@ -58,13 +53,11 @@ public class StringEditSupport implements EditSupport {if (model.getObject() != null) {if (propertyDescriptor.getPropertyGetter().getAnnotation(Multiline.class) != null) {return new MultilineLabel(id, model.getObject());- } else if (propertyDescriptor.getPropertyGetter().getAnnotation(Markdown.class) != null) {- return new MarkdownViewer(id, Model.of(model.getObject()), null);} else {return new Label(id, model.getObject());}} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.htmlindex 10b1aec49a..f8e55121eb 100644--- a/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html+++ b/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html@@ -6,7 +6,4 @@<wicket:fragment wicket:id="multiLineFrag"><textarea wicket:id="input" class="form-control autofocus" rows="4"></textarea></wicket:fragment>- <wicket:fragment wicket:id="markdownFrag">- <div wicket:id="input"></div>- </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.javaindex 82b9aa0029..c60d9072ac 100644--- a/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java@@ -3,6 +3,8 @@ package io.onedev.server.web.editable.string;import java.lang.reflect.Method;import org.apache.wicket.AttributeModifier;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.FormComponent;import org.apache.wicket.markup.html.form.TextArea;@@ -14,10 +16,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.util.editable.EditableUtils;-import io.onedev.server.util.editable.annotation.Markdown;import io.onedev.server.util.editable.annotation.Multiline;import io.onedev.server.util.editable.annotation.OmitName;-import io.onedev.server.web.component.markdown.MarkdownEditor;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;@@ -37,11 +37,7 @@ public class StringPropertyEditor extends PropertyEditor<String> {super.onInitialize();Method getter = getPropertyDescriptor().getPropertyGetter();- if (getter.getAnnotation(Markdown.class) != null) {- Fragment fragment = new Fragment("content", "markdownFrag", this);- fragment.add(input = new MarkdownEditor("input", Model.of(getModelObject()), false, null));- add(fragment);- } else if (getter.getAnnotation(Multiline.class) != null) {+ if (getter.getAnnotation(Multiline.class) != null) {Fragment fragment = new Fragment("content", "multiLineFrag", this);fragment.add(input = new TextArea<String>("input", Model.of(getModelObject())));input.setType(getPropertyDescriptor().getPropertyClass());@@ -52,13 +48,18 @@ public class StringPropertyEditor extends PropertyEditor<String> {input.setType(getPropertyDescriptor().getPropertyClass());add(fragment);}- Method propertyGetter = getPropertyDescriptor().getPropertyGetter();- if (propertyGetter.getAnnotation(OmitName.class) != null)- input.add(AttributeModifier.replace("placeholder", EditableUtils.getName(propertyGetter)));- String autocomplete = EditableUtils.getAutocomplete(getter);- if (autocomplete != null)- input.add(AttributeAppender.append("autocomplete", autocomplete));+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });++ if (getter.getAnnotation(OmitName.class) != null)+ input.add(AttributeModifier.replace("placeholder", EditableUtils.getName(getter)));add(new AttributeAppender("class", new LoadableDetachableModel<String>() {diff --git a/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.javaindex bcb719da0b..c3a458177f 100644--- a/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java@@ -1,16 +1,14 @@package io.onedev.server.web.editable.tagpattern;import java.lang.reflect.Method;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.util.editable.annotation.TagPattern;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -20,12 +18,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class TagPatternEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();if (propertyGetter.getAnnotation(TagPattern.class) != null) {@@ -45,7 +38,7 @@ public class TagPatternEditSupport implements EditSupport {if (refMatch != null) {return new Label(id, refMatch);} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.javaindex 4a64d63d2d..3a854f2fea 100644--- a/web/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java@@ -2,7 +2,6 @@ package io.onedev.server.web.editable.userchoice;import java.lang.reflect.Method;import java.util.List;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;@@ -11,9 +10,8 @@ import org.eclipse.jgit.util.StringUtils;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.editable.annotation.UserChoice;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -23,12 +21,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class UserEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();UserChoice userChoice = propertyGetter.getAnnotation(UserChoice.class);@@ -47,7 +40,7 @@ public class UserEditSupport implements EditSupport {if (userNames != null && !userNames.isEmpty()) {return new Label(id, StringUtils.join(userNames, ", " ));} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}@@ -56,7 +49,7 @@ public class UserEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {- return new UserMultiChoiceEditor(componentId, this, model, userChoice.type());+ return new UserMultiChoiceEditor(componentId, this, model);}};@@ -72,7 +65,7 @@ public class UserEditSupport implements EditSupport {if (model.getObject() != null) {return new Label(id, model.getObject());} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}@@ -81,7 +74,7 @@ public class UserEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new UserSingleChoiceEditor(componentId, this, model, userChoice.type());+ return new UserSingleChoiceEditor(componentId, this, model);}};diff --git a/web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex d83d527886..7575e43da3 100644--- a/web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -5,13 +5,19 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;+import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;+import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.annotation.UserChoice;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.userchoice.UserChoiceProvider;@@ -20,18 +26,19 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;+import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {- private UserMultiChoice input;+ private final List<UserFacade> choices = new ArrayList<>();- private final UserChoice.Type type;+ private UserMultiChoice input;public UserMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,- IModel<List<String>> propertyModel, UserChoice.Type type) {+ IModel<List<String>> propertyModel) {super(id, propertyDescriptor, propertyModel);- this.type = type;}@SuppressWarnings({ "rawtypes", "unchecked" })@@ -39,7 +46,23 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- List<UserFacade> users = new ArrayList<>();+ OneContext oneContext = new ComponentContext(this);++ OneContext.push(oneContext);+ try {+ UserChoice userChoice = propertyDescriptor.getPropertyGetter().getAnnotation(UserChoice.class);+ Preconditions.checkNotNull(userChoice);+ if (userChoice.value().length() != 0) {+ choices.addAll((List<UserFacade>)ReflectionUtils+ .invokeStaticMethod(propertyDescriptor.getBeanClass(), userChoice.value()));+ } else {+ choices.addAll(OneDev.getInstance(CacheManager.class).getUsers().values());+ }+ } finally {+ OneContext.pop();+ }++ List<UserFacade> users = new ArrayList<>();if (getModelObject() != null) {UserManager userManager = OneDev.getInstance(UserManager.class);for (String userName: getModelObject()) {@@ -49,9 +72,18 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {}}- input = new UserMultiChoice("input", new Model((Serializable)users), new UserChoiceProvider(type));+ input = new UserMultiChoice("input", new Model((Serializable)users), new UserChoiceProvider(choices));input.setConvertEmptyInputStringToNull(true);+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(input);}diff --git a/web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 16a4e5e805..c1c5b8e5df 100644--- a/web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -1,12 +1,21 @@package io.onedev.server.web.editable.userchoice;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;+import io.onedev.server.manager.CacheManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;+import io.onedev.server.util.OneContext;import io.onedev.server.util.editable.annotation.UserChoice;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.userchoice.UserChoiceProvider;@@ -15,24 +24,42 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.util.ComponentContext;+import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")public class UserSingleChoiceEditor extends PropertyEditor<String> {- private UserSingleChoice input;+ private final List<UserFacade> choices = new ArrayList<>();- private UserChoice.Type type;+ private UserSingleChoice input;public UserSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,- IModel<String> propertyModel, UserChoice.Type type) {+ IModel<String> propertyModel) {super(id, propertyDescriptor, propertyModel);- this.type = type;}+ @SuppressWarnings("unchecked")@Overrideprotected void onInitialize() {super.onInitialize();+ OneContext oneContext = new ComponentContext(this);++ OneContext.push(oneContext);+ try {+ UserChoice userChoice = propertyDescriptor.getPropertyGetter().getAnnotation(UserChoice.class);+ Preconditions.checkNotNull(userChoice);+ if (userChoice.value().length() != 0) {+ choices.addAll((List<UserFacade>)ReflectionUtils+ .invokeStaticMethod(propertyDescriptor.getBeanClass(), userChoice.value()));+ } else {+ choices.addAll(OneDev.getInstance(CacheManager.class).getUsers().values());+ }+ } finally {+ OneContext.pop();+ }+User user;if (getModelObject() != null)user = OneDev.getInstance(UserManager.class).findByName(getModelObject());@@ -40,12 +67,21 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {user = null;UserFacade facade = user!=null?user.getFacade():null;- input = new UserSingleChoice("input", Model.of(facade), new UserChoiceProvider(type));+ input = new UserSingleChoice("input", Model.of(facade), new UserChoiceProvider(choices));input.setConvertEmptyInputStringToNull(true);// add this to control allowClear flag of select2input.setRequired(propertyDescriptor.isPropertyRequired());+ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+add(input);}diff --git a/web/src/main/java/io/onedev/server/web/editable/verification/VerificationEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationEditSupport.javaindex d10785deda..3c829cf520 100644--- a/web/src/main/java/io/onedev/server/web/editable/verification/VerificationEditSupport.java+++ b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationEditSupport.java@@ -2,7 +2,6 @@ package io.onedev.server.web.editable.verification;import java.lang.reflect.Method;import java.util.List;-import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;@@ -11,9 +10,8 @@ import org.eclipse.jgit.util.StringUtils;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.editable.annotation.VerificationChoice;-import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.NotDefinedLabel;+import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -23,12 +21,7 @@ import io.onedev.server.web.editable.PropertyViewer;public class VerificationEditSupport implements EditSupport {@Override- public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {- return null;- }-- @Override- public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);Method propertyGetter = propertyDescriptor.getPropertyGetter();VerificationChoice verificationChoice = propertyGetter.getAnnotation(VerificationChoice.class);@@ -47,7 +40,7 @@ public class VerificationEditSupport implements EditSupport {if (verifications != null && !verifications.isEmpty()) {return new Label(id, StringUtils.join(verifications, ", " ));} else {- return new NotDefinedLabel(id);+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}}diff --git a/web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.javaindex 90ebf5c1db..93629b1c97 100644--- a/web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java+++ b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java@@ -51,11 +51,9 @@ public class VerificationMultiChoiceEditor extends PropertyEditor<List<String>>@Overrideprotected List<String> convertInputToValue() throws ConversionException {List<String> verifications = new ArrayList<>();- Collection<String> convertedInput = input.getConvertedInput();- if (convertedInput != null) {- for (String each: convertedInput)- verifications.add(each);- }+ Collection<String> model = input.getConvertedInput();+ if (model != null)+ verifications.addAll(model);return verifications;}diff --git a/web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.javaindex 1ef194b2be..b6c8f7115a 100644--- a/web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java+++ b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java@@ -12,7 +12,7 @@ import org.apache.wicket.model.Model;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ComponentRenderer;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.sidebar.SidebarPanel;+import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;@@ -37,7 +37,7 @@ public abstract class AdministrationPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- add(new SidebarPanel("sidebar", "administration.miniSidebar") {+ add(new SideBar("sidebar", "administration.miniSidebar") {@Overrideprotected List<? extends Tab> newTabs() {diff --git a/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.javaindex 58ed5bcf47..938e6d10a0 100644--- a/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java+++ b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java@@ -4,7 +4,7 @@ import java.io.Serializable;import io.onedev.server.security.authenticator.Authenticator;import io.onedev.server.util.editable.annotation.Editable;-import io.onedev.server.util.editable.annotation.NullChoice;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;@Editablepublic class AuthenticatorHolder implements Serializable {@@ -14,7 +14,7 @@ public class AuthenticatorHolder implements Serializable {private Authenticator authenticator;@Editable- @NullChoice("No external authentication")+ @NameOfEmptyValue("No external authentication")public Authenticator getAuthenticator() {return authenticator;}diff --git a/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.javaindex 02c7e21efe..c6564d4c20 100644--- a/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java+++ b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -28,7 +28,7 @@ import io.onedev.server.web.behavior.testform.TestResult;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.EditorChanged;+import io.onedev.server.web.editable.PropertyUpdating;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.admin.AdministrationPage;@@ -120,10 +120,10 @@ public class AuthenticatorPage extends AdministrationPage {protected void onConfigure() {super.onConfigure();- BeanEditor<Serializable> beanEditor = authenticatorEditor.visitChildren(BeanEditor.class,- new IVisitor<BeanEditor<Serializable>, BeanEditor<Serializable>>() {+ BeanEditor beanEditor = authenticatorEditor.visitChildren(BeanEditor.class,+ new IVisitor<BeanEditor, BeanEditor>() {- public void component(BeanEditor<Serializable> component, IVisit<BeanEditor<Serializable>> visit) {+ public void component(BeanEditor component, IVisit<BeanEditor> visit) {visit.stop(component);}@@ -140,7 +140,7 @@ public class AuthenticatorPage extends AdministrationPage {@Overrideprotected Component newContent(String id) {Fragment fragment = new Fragment(id, "testFrag", AuthenticatorPage.this);- BeanEditor<Serializable> tokenEditor = BeanContext.editBean("editor", token);+ BeanEditor tokenEditor = BeanContext.editBean("editor", token);tokenEditor.setOutputMarkupId(true);Form<?> form = new Form<Void>("form") {@@ -199,9 +199,9 @@ public class AuthenticatorPage extends AdministrationPage {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof EditorChanged) {- EditorChanged editorChanged = (EditorChanged) event.getPayload();- editorChanged.getHandler().add(testButton);+ if (event.getPayload() instanceof PropertyUpdating) {+ PropertyUpdating propertyChanged = (PropertyUpdating) event.getPayload();+ propertyChanged.getHandler().add(testButton);}}diff --git a/web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.java b/web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.javaindex 916475ab54..a778376ec8 100644--- a/web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.java+++ b/web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.java@@ -21,7 +21,7 @@ import io.onedev.server.manager.ConfigManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.web.WebConstants;+import io.onedev.server.util.Constants;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.admin.AdministrationPage;@@ -91,9 +91,9 @@ public class LicenseManagementPage extends AdministrationPage {LicenseDetail.FREE_LICENSE_USERS, licenseDetail.getLicensedUsers());fragment.add(new Label("users", usersInfo).setEscapeModelStrings(false));fragment.add(new Label("issueDate",- WebConstants.DATE_FORMATTER.print(new DateTime(licenseDetail.getIssueDate()))));+ Constants.DATE_FORMATTER.print(new DateTime(licenseDetail.getIssueDate()))));fragment.add(new Label("expirationDate",- WebConstants.DATE_FORMATTER.print(new DateTime(licenseDetail.getExpirationDate())) + " (<a href=\"https://www.onedev.io/purchase\">renew</a>)").setEscapeModelStrings(false));+ Constants.DATE_FORMATTER.print(new DateTime(licenseDetail.getExpirationDate())) + " (<a href=\"https://www.onedev.io/purchase\">renew</a>)").setEscapeModelStrings(false));fragment.add(new Label("issueAccount", licenseDetail.getIssueAccount()));add(fragment);} else {diff --git a/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.javaindex 110bfb918c..c63e579049 100644--- a/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java+++ b/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java@@ -1,7 +1,5 @@package io.onedev.server.web.page.admin.mailsetting;-import java.io.Serializable;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.event.IEvent;@@ -21,9 +19,9 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.web.behavior.testform.TestFormBehavior;import io.onedev.server.web.behavior.testform.TestResult;+import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.EditorChanged;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.utils.ExceptionUtils;@@ -39,7 +37,7 @@ public class MailSettingPage extends AdministrationPage {MailSettingHolder mailSettingHolder = new MailSettingHolder();mailSettingHolder.setMailSetting(OneDev.getInstance(ConfigManager.class).getMailSetting());- BeanEditor<Serializable> editor = BeanContext.editBean("editor", mailSettingHolder);+ BeanEditor editor = BeanContext.editBean("editor", mailSettingHolder);Button saveButton = new Button("save") {@@ -88,9 +86,9 @@ public class MailSettingPage extends AdministrationPage {protected void onConfigure() {super.onConfigure();- BeanEditor<Serializable> mailSettingEditor = editor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor<Serializable>, BeanEditor<Serializable>>() {+ BeanEditor mailSettingEditor = editor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor, BeanEditor>() {- public void component(BeanEditor<Serializable> component, IVisit<BeanEditor<Serializable>> visit) {+ public void component(BeanEditor component, IVisit<BeanEditor> visit) {visit.stop(component);}@@ -120,9 +118,9 @@ public class MailSettingPage extends AdministrationPage {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof EditorChanged) {- EditorChanged editorChanged = (EditorChanged) event.getPayload();- editorChanged.getHandler().add(testButton);+ if (event.getPayload() instanceof BeanUpdating) {+ BeanUpdating beanChanged = (BeanUpdating) event.getPayload();+ beanChanged.getHandler().add(testButton);}}diff --git a/web/src/main/java/io/onedev/server/web/page/base/base.css b/web/src/main/java/io/onedev/server/web/page/base/base.cssindex c0df6f28ed..d6b5ced03e 100644--- a/web/src/main/java/io/onedev/server/web/page/base/base.css+++ b/web/src/main/java/io/onedev/server/web/page/base/base.css@@ -103,6 +103,9 @@ a.wicket_orderDown:AFTER {.pagination a.first, .pagination a.prev, .pagination a.next, .pagination a.last {font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}+.norecords-td {+ font-style: italic;+}/* TREE */.tree-theme-windows .tree-node span.tree-content a {@@ -149,36 +152,31 @@ form>.test-feedback {padding: 12px 0;}-.editable>.reflection>table {+.editable>.bean>table {width: 100%;}-.editable>.reflection>table>tbody>tr>td {+.editable>.bean>table>tbody>tr>td {vertical-align: top;+ padding: 0 8px 16px 0;}-.editable>.reflection>table>tbody>tr>td {- padding: 10px;+.editable td.value>div:last-child>div:last-child>table>tbody>tr:last-child>td.value,+.editable td.value>div:last-child>div:last-child>div:last-child>div:last-child>table>tbody>tr:last-child>td.value {+ padding-bottom: 0;+ margin-bottom: 0;}-.editable>.reflection>table>tbody>tr>td.name {- font-weight: bold;- font-size: 13px;- background: #F0F0F0;++.editable>.bean>table>tbody>tr>td.name {+ font-size: 12px;+ line-height: 22px;+ font-weight: bold;+ border-right: 1px solid #E0E0E0;text-align: right;white-space: nowrap;width: 20%;}-.editable>.reflection>table>tbody>tr:first-child>td.name {- border-radius: 4px 4px 0 0;-}-.editable>.reflection>table>tbody>tr:last-child>td.name {- border-radius: 0 0 4px 4px;+.editable>.bean>table>tbody>tr>td.value {+ padding-left: 8px;}-.editable>.reflection>table>tbody>tr:first-child:last-child>td.name {- border-radius: 4px;-}--.editor>.reflection.properties>div.form-group:last-child {- margin-bottom: 0;-}.editable>table.polymorphic.vertical.list>tbody>tr>td>.type-selector {margin-bottom: 8px;@@ -231,12 +229,31 @@ form>.test-feedback {padding-top: 12px;margin-bottom: 12px;}-.viewer .reflection>table>tbody>tr.name-omitted>td {- padding: 0;+.viewer .bean>table>tbody>tr.name-omitted>td {+ padding-left: 0;}-.viewer .type-selector, .viewer .no-elements {+.viewer .type-selector, .viewer .no-elements, .editor .no-elements {font-style: italic;}+.editable .editor .bean.list>thead>tr>th {+ border-bottom: 1px solid #E0E0E0;+}+.editable .viewer .bean.list>thead>tr>th {+ font-size: 12px;+ padding-top: 0;+ line-height: 22px;+ white-space: nowrap;+}+.editable table.bean.list>thead>tr>th, .editable table.bean.list>tbody>tr>td {+ padding: 5px 10px 5px 0;+}+.editable .editor table.bean.list tr:hover td {+ background: #F9F9F9;+}+.editable .editor table.bean.list tr.add-element:hover td {+ background: none;+}+/* Select2 */.editor .select2-container {diff --git a/web/src/main/java/io/onedev/server/web/page/base/base.js b/web/src/main/java/io/onedev/server/web/page/base/base.jsindex 40c935f0ef..0fde76684f 100644--- a/web/src/main/java/io/onedev/server/web/page/base/base.js+++ b/web/src/main/java/io/onedev/server/web/page/base/base.js@@ -83,19 +83,6 @@ onedev.server = {}},- editable: {- adjustReflectionEditor: function(editorId) {- var editor = $("#" + editorId);- var input = editor.find(".value>input[type=checkbox]");- input.parent().prev("label.name").addClass("pull-left");- input.after("<div style='clear:both;'/>")-- input = editor.find(".value>div>input[type=checkbox]");- input.parent().parent().prev("label.name").addClass("pull-left");- input.after("<div style='clear:both;'/>")- }- },-form: {/** This function can be called to mark enclosing form of specified element dirty. It should be@@ -303,13 +290,22 @@ onedev.server = {var selector = ".has-error:visible:first .autofocus";var $inError = $containers.find(selector).addBack(selector);if ($inError.length != 0 && $inError.closest(".no-autofocus").length == 0) {- $inError.focus();+ if ($inError.children(".CodeMirror").length != 0) {+ $inError.children(".CodeMirror")[0].CodeMirror.focus();+ } else {+ $inError.focus();+ }} else {selector = ".autofocus:visible";$containers.find(selector).addBack(selector).each(function() {var $this = $(this);if ($this.closest(".no-autofocus").length == 0) {- $this.focus();+ console.log($this[0]);+ if ($this.children(".CodeMirror").length != 0) {+ $this.children(".CodeMirror")[0].CodeMirror.focus();+ } else {+ $this.focus();+ }return false;}});diff --git a/web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java b/web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.javaindex 228046a95f..c247b1de06 100644--- a/web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java+++ b/web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java@@ -15,29 +15,36 @@ import io.onedev.utils.WordUtils;@SuppressWarnings("serial")public class ExpectedExceptionPage extends BaseErrorPage {- private final Exception exception;+ private final String title;- public ExpectedExceptionPage(Exception exception) {- this.exception = exception;- }+ private final String description;- @Override- protected void onInitialize() {- super.onInitialize();-+ private final String detailMessage;++ public ExpectedExceptionPage(Exception exception) {String title = exception.getClass().getSimpleName();String suffixToRemove = "Exception";if (title.endsWith(suffixToRemove))title = title.substring(0, title.length()-suffixToRemove.length());title = WordUtils.capitalizeFully(WordUtils.uncamel(title));+ this.title = title;++ this.description = exception.getMessage();+ this.detailMessage = Strings.toString(exception);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+WebMarkupContainer container = new WebMarkupContainer("error");container.setOutputMarkupId(true);add(container);container.add(new Label("title", title));- container.add(new Label("description", exception.getMessage()));+ container.add(new Label("description", description));container.add(new ViewStateAwarePageLink<Void>("home", ProjectListPage.class));@@ -46,7 +53,7 @@ public class ExpectedExceptionPage extends BaseErrorPage {@Overridepublic void onClick(AjaxRequestTarget target) {Fragment fragment = new Fragment("detail", "detailFrag", ExpectedExceptionPage.this);- fragment.add(new MultilineLabel("body", Strings.toString(exception)));+ fragment.add(new MultilineLabel("body", detailMessage));container.replace(fragment);target.add(container);setVisible(false);diff --git a/web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java b/web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.javaindex 3cb83e5c91..348644e50c 100644--- a/web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java+++ b/web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java@@ -46,17 +46,16 @@ public class UnexpectedExceptionPage extends BaseErrorPage {private static final long serialVersionUID = 1L;- private Exception exception;+ private final String description;public UnexpectedExceptionPage(Exception exception) {- this.exception = exception;+ description = "Error Details: \n\n" + StringUtils.replace(Strings.toString(exception).trim(), " ", "\t");}@Overrideprotected void onInitialize() {super.onInitialize();- String description = "Error Details: \n\n" + StringUtils.replace(Strings.toString(exception).trim(), " ", "\t");add(new TextArea<String>("description", Model.of(description)));add(new WebMarkupContainer("contactName") {diff --git a/web/src/main/java/io/onedev/server/web/page/group/GroupPage.java b/web/src/main/java/io/onedev/server/web/page/group/GroupPage.javaindex a04baa2108..d1a43ccac3 100644--- a/web/src/main/java/io/onedev/server/web/page/group/GroupPage.java+++ b/web/src/main/java/io/onedev/server/web/page/group/GroupPage.java@@ -18,7 +18,7 @@ import io.onedev.server.model.Group;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ComponentRenderer;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.sidebar.SidebarPanel;+import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.layout.LayoutPage;@@ -44,7 +44,7 @@ public abstract class GroupPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- add(new SidebarPanel("sidebar", "group.miniSidebar") {+ add(new SideBar("sidebar", "group.miniSidebar") {@Overrideprotected List<? extends Tab> newTabs() {diff --git a/web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java b/web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.javaindex c63444450f..2a0429e029 100644--- a/web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java+++ b/web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java@@ -28,7 +28,7 @@ import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class GroupProfilePage extends GroupPage {- private BeanEditor<?> editor;+ private BeanEditor editor;private CheckBox administratorInput;diff --git a/web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java b/web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.javaindex 1cfde31faa..a90b0e6123 100644--- a/web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java+++ b/web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java@@ -41,7 +41,7 @@ public class NewGroupPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- BeanEditor<?> editor = BeanContext.editBean("editor", group,+ BeanEditor editor = BeanContext.editBean("editor", group,Sets.newHashSet("administrator", "canCreateProjects"));Form<?> form = new Form<Void>("form") {diff --git a/web/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.html b/web/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.htmlnew file mode 100644index 0000000000..00a09a7014--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.html@@ -0,0 +1,9 @@+<wicket:panel>+ <div class="head">+ <span wicket:id="title" class="title"></span>+ <a wicket:id="close" class="close" title="Close"><i class="fa fa-close"></i></a>+ </div>+ <div class="body">+ <div wicket:id="content"></div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.java b/web/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.javanew file mode 100644index 0000000000..4777071107--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.java@@ -0,0 +1,37 @@+package io.onedev.server.web.page.layout;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;++@SuppressWarnings("serial")+abstract class CloseablePanel extends Panel {++ private final String title;++ public CloseablePanel(String id, String title) {+ super(id);+ this.title = title;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("title", title));+ add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onClose(target);+ }++ });+ add(newFloatingContent("content"));+ }++ protected abstract Component newFloatingContent(String id);++ protected abstract void onClose(AjaxRequestTarget target);+}diff --git a/web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex ab946483e5..30027a381a 100644--- a/web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -54,6 +54,8 @@ import io.onedev.utils.license.LicenseDetail;@SuppressWarnings("serial")public abstract class LayoutPage extends BasePage {+ private WebMarkupContainer head;+public LayoutPage() {}@@ -65,7 +67,7 @@ public abstract class LayoutPage extends BasePage {protected void onInitialize() {super.onInitialize();- WebMarkupContainer head = new WebMarkupContainer("head");+ head = new WebMarkupContainer("head");add(head);head.add(new DropdownLink("nav") {@@ -172,6 +174,7 @@ public abstract class LayoutPage extends BasePage {head.add(new WebMarkupContainer("userMenu").setVisible(false));}+ head.setOutputMarkupId(true);}protected List<ComponentRenderer> getBreadcrumbs() {@@ -197,5 +200,5 @@ public abstract class LayoutPage extends BasePage {super.renderHead(response);response.render(CssHeaderItem.forReference(new LayoutResourceReference()));}-+}diff --git a/web/src/main/java/io/onedev/server/web/page/layout/SideFloating.java b/web/src/main/java/io/onedev/server/web/page/layout/SideFloating.javanew file mode 100644index 0000000000..c2bb827068--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/layout/SideFloating.java@@ -0,0 +1,40 @@+package io.onedev.server.web.page.layout;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;++import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.util.Animation;++@SuppressWarnings("serial")+public abstract class SideFloating extends FloatingPanel {++ public enum Placement {LEFT, RIGHT}++ public SideFloating(AjaxRequestTarget target, Placement placement) {+ super(target, null, Animation.valueOf(placement.name()));+ add(AttributeAppender.append("class", "side side-" + placement.name().toLowerCase()));+ }++ protected abstract String getTitle();++ protected abstract Component newBody(String id);++ @Override+ protected Component newContent(String id) {+ return new CloseablePanel(id, getTitle()) {++ protected void onClose(AjaxRequestTarget target) {+ close();+ }++ @Override+ protected Component newFloatingContent(String id) {+ return SideFloating.this.newBody(id);+ }++ };+ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/layout/layout.css b/web/src/main/java/io/onedev/server/web/page/layout/layout.cssindex 17662a545f..bd8cf41b9c 100644--- a/web/src/main/java/io/onedev/server/web/page/layout/layout.css+++ b/web/src/main/java/io/onedev/server/web/page/layout/layout.css@@ -160,4 +160,32 @@border-top: 1px solid #DDD;margin: 8px 0;height: 0;+}++.floating.side {+ position: fixed;+ top: 48px;+ border-top: none;+ border-bottom: none;+ bottom: 0;+ width: 360px;+ border-radius: 0;+ overflow: auto;+}+.floating.side-left {+ border-left: none;+ left: 0;+}+.floating.side-right {+ border-right: none;+ right: 0;+}+.floating.side>.content>.head {+ padding: 12px;+ font-weight: bold;+ font-size: 16px;+ border-bottom: 1px solid #E0E0E0;+}+.floating.side>.content>.body {+ padding: 12px;}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex cc2d80206f..7a34d1a4cf 100644--- a/web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -38,7 +38,7 @@ public class NewProjectPage extends LayoutPage {Project project = new Project();- BeanEditor<?> editor = BeanContext.editBean("editor", project);+ BeanEditor editor = BeanContext.editBean("editor", project);Form<?> form = new Form<Void>("form") {diff --git a/web/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/web/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 1dc121ba38..eba93af108 100644--- a/web/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -33,21 +33,23 @@ import io.onedev.server.web.ComponentRenderer;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.sidebar.SidebarPanel;+import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;-import io.onedev.server.web.page.project.commit.ProjectCommitsPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;+import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;import io.onedev.server.web.page.project.moreinfo.MoreInfoPanel;-import io.onedev.server.web.page.project.pullrequest.InvalidRequestPage;-import io.onedev.server.web.page.project.pullrequest.newrequest.NewRequestPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;-import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage;+import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;+import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;@@ -121,7 +123,7 @@ public abstract class ProjectPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- add(new SidebarPanel("sidebar", "project.miniSidebar") {+ add(new SideBar("sidebar", "project.miniSidebar") {@Overrideprotected List<? extends Tab> newTabs() {@@ -137,6 +139,8 @@ public abstract class ProjectPage extends LayoutPage {tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class, InvalidRequestPage.class));+ tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, IssueListPage.class, NewIssuePage.class));+tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",0, ProjectCodeCommentsPage.class));diff --git a/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 3ee60ea1ae..4be4413e97 100644--- a/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -99,7 +99,7 @@ import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;import io.onedev.server.web.page.project.blob.search.advanced.AdvancedSearchPanel;import io.onedev.server.web.page.project.blob.search.quick.QuickSearchPanel;import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;-import io.onedev.server.web.page.project.commit.ProjectCommitsPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.util.resource.RawBlobResourceReference;import io.onedev.server.web.websocket.CodeCommentChangedRegion;import io.onedev.server.web.websocket.CommitIndexedRegion;diff --git a/web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js b/web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.jsindex df998e5a2c..effcb61bb4 100644--- a/web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js+++ b/web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js@@ -32,10 +32,7 @@ onedev.server.projectBlob = {var $revisionPicker = $head.find(">.revision-picker");var $operations = $head.find(">.operations");- // we should simply call $head.width() here, but the value is incorrect after maximize and restore- // window in IE and Chrome (maybe due to use of table in sidebar?), so we go with the complicate- // approach of calculating the head width- var headWidth = $("#project").width() - $("#project>.sidebar>table>tbody>tr>td.nav").outerWidth();+ var headWidth = $head.width();// below code moves file navigator to bottom if it is too widevar maxWidth = headWidth - $revisionPicker.outerWidth() - $operations.outerWidth();diff --git a/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.javaindex 64de200396..ddeb6f9d3a 100644--- a/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java+++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java@@ -24,7 +24,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.user.UserProfilePage;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.avatar.AvatarManager;diff --git a/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex cce0d65ed6..af7754be69 100644--- a/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -98,7 +98,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;import io.onedev.server.web.page.project.blob.render.view.Markable;import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.WicketUtils;diff --git a/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.jsindex 048400ec44..0c1657ebab 100644--- a/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js+++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js@@ -5,7 +5,6 @@ onedev.server.sourceEdit = {var $sourceEdit = $container.children(".source-edit");var $warning = $sourceEdit.children(".warning");var $code = $sourceEdit.children(".code");-var cm = CodeMirror($code[0], {value: $sourceEdit.children(".input").val(),autofocus: autoFocus,diff --git a/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 03431e442b..dc41095a1d 100644--- a/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -80,13 +80,13 @@ import io.onedev.server.web.component.verification.VerificationStatusPanel;import io.onedev.server.web.page.project.NoCommitsPage;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;-import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage;-import io.onedev.server.web.page.project.pullrequest.requestlist.SearchOption;-import io.onedev.server.web.page.project.pullrequest.requestlist.SortOption;-import io.onedev.server.web.page.project.pullrequest.requestlist.SearchOption.Status;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;+import io.onedev.server.web.page.project.pullrequests.requestlist.SearchOption;+import io.onedev.server.web.page.project.pullrequests.requestlist.SortOption;+import io.onedev.server.web.page.project.pullrequests.requestlist.SearchOption.Status;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.utils.StringUtils;diff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.html b/web/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.java b/web/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javasimilarity index 99%rename from web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.javarename to web/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 6ccdd4fa43..9d2f38ee2d 100644--- a/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.commit;+package io.onedev.server.web.page.project.commits;import java.io.Serializable;import java.util.ArrayList;diff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailResourceReference.javasimilarity index 95%rename from web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailResourceReference.javaindex 7b39b99be3..f33629f383 100644--- a/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.commit;+package io.onedev.server.web.page.project.commits;import java.util.List;diff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/CommitQuery.g4 b/web/src/main/java/io/onedev/server/web/page/project/commits/CommitQuery.g4similarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/commit/CommitQuery.g4rename to web/src/main/java/io/onedev/server/web/page/project/commits/CommitQuery.g4diff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/CommitQueryBehavior.java b/web/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.javasimilarity index 95%rename from web/src/main/java/io/onedev/server/web/page/project/commit/CommitQueryBehavior.javarename to web/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.javaindex 5cb6a533d7..f2d26d6476 100644--- a/web/src/main/java/io/onedev/server/web/page/project/commit/CommitQueryBehavior.java+++ b/web/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.commit;+package io.onedev.server.web.page.project.commits;import java.util.ArrayList;import java.util.LinkedHashMap;@@ -17,7 +17,7 @@ import io.onedev.server.OneDev;import io.onedev.server.git.NameAndEmail;import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.model.Project;-import io.onedev.server.web.WebConstants;+import io.onedev.server.util.Constants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;import io.onedev.utils.Range;@@ -25,8 +25,6 @@ import io.onedev.utils.StringUtils;import io.onedev.utils.stringmatch.PatternApplied;import io.onedev.utils.stringmatch.WildcardUtils;-import io.onedev.server.web.page.project.commit.CommitQueryParser;-@SuppressWarnings("serial")public class CommitQueryBehavior extends ANTLRAssistBehavior {@@ -103,9 +101,9 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {matchRange));}suggestions.add(new InputSuggestion(- WebConstants.DATETIME_FORMATTER.print(System.currentTimeMillis())));+ Constants.DATETIME_FORMATTER.print(System.currentTimeMillis())));suggestions.add(new InputSuggestion(- WebConstants.DATE_FORMATTER.print(System.currentTimeMillis())));+ Constants.DATE_FORMATTER.print(System.currentTimeMillis())));for (String dateExample: DATE_EXAMPLES) {suggestions.add(new InputSuggestion(dateExample));}diff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.html b/web/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.java b/web/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javasimilarity index 97%rename from web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.javarename to web/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex 2128c4e7e6..aece097298 100644--- a/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.commit;+package io.onedev.server.web.page.project.commits;import java.io.IOException;import java.io.Serializable;@@ -46,11 +46,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.java.JavaEscape;-import io.onedev.server.web.page.project.commit.CommitQueryLexer;-import io.onedev.server.web.page.project.commit.CommitQueryParser;-import io.onedev.server.web.page.project.commit.CommitQueryParser.CriteriaContext;-import io.onedev.server.web.page.project.commit.CommitQueryParser.FuzzyCriteriaContext;-import io.onedev.server.web.page.project.commit.CommitQueryParser.QueryContext;import com.google.common.base.Joiner;import com.google.common.base.Optional;import com.google.common.base.Throwables;@@ -64,8 +59,8 @@ import io.onedev.server.git.command.RevListCommand;import io.onedev.server.manager.VerificationManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.ProjectAndRevision;+import io.onedev.server.util.Constants;import io.onedev.server.util.Verification;-import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.avatar.ContributorAvatars;import io.onedev.server.web.component.commitgraph.CommitGraphResourceReference;@@ -76,6 +71,9 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.verification.VerificationStatusPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.commits.CommitQueryParser.CriteriaContext;+import io.onedev.server.web.page.project.commits.CommitQueryParser.FuzzyCriteriaContext;+import io.onedev.server.web.page.project.commits.CommitQueryParser.QueryContext;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.util.ajaxlistener.IndicateLoadingListener;import io.onedev.server.web.util.model.CommitRefsModel;@@ -520,7 +518,7 @@ public class ProjectCommitsPage extends ProjectPage {} else {item = new Fragment(itemId, "dateFrag", this);DateTime dateTime = new DateTime(current.get(index+1).getCommitterIdent().getWhen());- item.add(new Label("date", WebConstants.DATE_FORMATTER.print(dateTime)));+ item.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));item.add(AttributeAppender.append("class", "date"));}item.setOutputMarkupId(true);diff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsResourceReference.javasimilarity index 86%rename from web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsResourceReference.javaindex 3e0693feb4..56ceb17cef 100644--- a/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.commit;+package io.onedev.server.web.page.project.commits;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.css b/web/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.cssrename to web/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.js b/web/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.jssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.jsrename to web/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.jsdiff --git a/web/src/main/java/io/onedev/server/web/page/project/commit/project-commits.css b/web/src/main/java/io/onedev/server/web/page/project/commits/project-commits.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/commit/project-commits.cssrename to web/src/main/java/io/onedev/server/web/page/project/commits/project-commits.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 97a95bdf8b..1f9471e3f3 100644--- a/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -53,10 +53,10 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.NoCommitsPage;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;-import io.onedev.server.web.page.project.pullrequest.newrequest.NewRequestPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;import io.onedev.server.web.websocket.CodeCommentChangedRegion;import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.WebSocketManager;diff --git a/web/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html b/web/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.htmlnew file mode 100644index 0000000000..797b8e5497--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html@@ -0,0 +1,9 @@+<wicket:extend>+ <div id="issue-list">+ <div class="head">+ <a wicket:id="newIssue" class="btn btn-default"><i class="fa fa-plus"></i> Create New</a>+ </div>+ <div class="body">+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/web/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.javanew file mode 100644index 0000000000..72e331dd29--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java@@ -0,0 +1,22 @@+package io.onedev.server.web.page.project.issues.issuelist;++import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;++@SuppressWarnings("serial")+public class IssueListPage extends ProjectPage {++ public IssueListPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())));+ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.htmlnew file mode 100644index 0000000000..14d4021a0e--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html@@ -0,0 +1,12 @@+<wicket:extend>+ <div id="new-issue">+ <div class="head">Create Issue</div>+ <div class="body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="generalSetting"></div>+ <div wicket:id="customFields"></div>+ <button type="submit" class="btn btn-primary dirty-aware">Save</button>+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.javanew file mode 100644index 0000000000..0fc42dbc39--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java@@ -0,0 +1,69 @@+package io.onedev.server.web.page.project.issues.newissue;++import java.io.Serializable;+import java.util.List;+import java.util.Map;++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.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.model.Issue;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.InputContext;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.project.ProjectPage;++@SuppressWarnings("serial")+public class NewIssuePage extends ProjectPage implements InputContext {++ public NewIssuePage(PageParameters params) {+ super(params);+ }++ private IssueManager getIssueManager() {+ return OneDev.getInstance(IssueManager.class);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Issue issue = new Issue();+ issue.setProject(getProject());++ Form<?> form = new Form<Void>("form");+ form.add(BeanContext.editBean("generalSetting", issue));++ Serializable customFieldsBean;+ try {+ customFieldsBean = getIssueManager().defineCustomFieldsBeanClass(getProject()).newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }++ form.add(BeanContext.editBean("customFields", customFieldsBean));++ add(form);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new NewIssueResourceReference()));+ }++ @Override+ public List<String> getScenarios() {+ return getProject().getIssueWorkflow().getScenarios();+ }++ @Override+ public Map<String, Input> getInputs() {+ return getProject().getIssueWorkflow().getInputs();+ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssueResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssueResourceReference.javanew file mode 100644index 0000000000..e32d44cc6f--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssueResourceReference.java@@ -0,0 +1,12 @@+package io.onedev.server.web.page.project.issues.newissue;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++@SuppressWarnings("serial")+public class NewIssueResourceReference extends BaseDependentCssResourceReference {++ public NewIssueResourceReference() {+ super(NewIssueResourceReference.class, "new-issue.css");+ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.cssnew file mode 100644index 0000000000..bd2c351556--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css@@ -0,0 +1,7 @@+#new-issue>.head {+ font-size: 18px;+ margin-bottom: 20px;+}+#new-issue>.body>div {+ margin-bottom: 20px;+}diff --git a/web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.javaindex 9de430b2ce..f078661473 100644--- a/web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.java@@ -35,7 +35,7 @@ abstract class ForkOptionPanel extends Panel {project.setForkedFrom(getProject());project.setName(getProject().getName() + "." + SecurityUtils.getUser().getName());- BeanEditor<?> editor = BeanContext.editBean("editor", project);+ BeanEditor editor = BeanContext.editBean("editor", project);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);diff --git a/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.java b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.javaindex 19a73d09d2..8fc25fd095 100644--- a/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.java@@ -32,7 +32,7 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.projectselector.ProjectSelector;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;-import io.onedev.server.web.page.project.commit.ProjectCommitsPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;@SuppressWarnings("serial")diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.javasimilarity index 95%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.javaindex 6901661929..1b6663a3ce 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest;+package io.onedev.server.web.page.project.pullrequests;import javax.persistence.EntityNotFoundException;@@ -18,7 +18,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.NoCommitsPage;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage;+import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestResourceReference.javasimilarity index 84%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestResourceReference.javaindex c69ba1d22c..a1012b8900 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest;+package io.onedev.server.web.page.project.pullrequests;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/invalid-request.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/invalid-request.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/invalid-request.cssrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/invalid-request.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.javasimilarity index 98%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.javaindex 6cc33fdae0..cc1b903a82 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.newrequest;+package io.onedev.server.web.page.project.pullrequests.newrequest;import java.io.IOException;import java.util.ArrayList;@@ -73,10 +73,10 @@ import io.onedev.server.web.component.verification.RequiredVerificationsPanel;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.NoCommitsPage;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.PageDataChanged;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestResourceReference.javasimilarity index 81%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestResourceReference.javaindex 09c9d548f9..7b32a037c0 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.newrequest;+package io.onedev.server.web.page.project.pullrequests.newrequest;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/new-request.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/new-request.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/new-request.cssrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/new-request.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/CheckoutRequestInstructionPanel.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/CheckoutRequestInstructionPanel.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/CheckoutRequestInstructionPanel.javasimilarity index 93%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/CheckoutRequestInstructionPanel.javaindex 69a7b35291..d4377b7ee2 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/CheckoutRequestInstructionPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail;+package io.onedev.server.web.page.project.pullrequests.requestdetail;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/PullRequestOperation.javasimilarity index 98%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/PullRequestOperation.javaindex f907ed87f3..269a5f74a8 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/PullRequestOperation.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail;+package io.onedev.server.web.page.project.pullrequests.requestdetail;import javax.annotation.Nullable;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.javasimilarity index 96%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.javaindex 6be4d4feae..9df4143a44 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java@@ -1,15 +1,15 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail;+package io.onedev.server.web.page.project.pullrequests.requestdetail;import static io.onedev.server.model.support.MergeStrategy.ALWAYS_MERGE;import static io.onedev.server.model.support.MergeStrategy.MERGE_IF_NECESSARY;import static io.onedev.server.model.support.MergeStrategy.REBASE_MERGE;import static io.onedev.server.model.support.MergeStrategy.SQUASH_MERGE;-import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.APPROVE;-import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH;-import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE;-import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DISCARD;-import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.REOPEN;-import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.RESTORE_SOURCE_BRANCH;+import static io.onedev.server.web.page.project.pullrequests.requestdetail.PullRequestOperation.APPROVE;+import static io.onedev.server.web.page.project.pullrequests.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH;+import static io.onedev.server.web.page.project.pullrequests.requestdetail.PullRequestOperation.DISAPPROVE;+import static io.onedev.server.web.page.project.pullrequests.requestdetail.PullRequestOperation.DISCARD;+import static io.onedev.server.web.page.project.pullrequests.requestdetail.PullRequestOperation.REOPEN;+import static io.onedev.server.web.page.project.pullrequests.requestdetail.PullRequestOperation.RESTORE_SOURCE_BRANCH;import java.util.ArrayList;import java.util.Collection;@@ -88,11 +88,11 @@ import io.onedev.server.web.component.verification.VerificationStatusPanel;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.NoCommitsPage;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.pullrequest.InvalidRequestPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.codecomments.RequestCodeCommentsPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.mergepreview.MergePreviewPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.WicketUtils;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailResourceReference.javasimilarity index 81%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailResourceReference.javaindex ca39f46e4c..52daccba77 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail;+package io.onedev.server.web.page.project.pullrequests.requestdetail;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/ResolveConflictInstructionPanel.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/ResolveConflictInstructionPanel.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/ResolveConflictInstructionPanel.javasimilarity index 97%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/ResolveConflictInstructionPanel.javaindex 19f7b500d9..738989d059 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/ResolveConflictInstructionPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail;+package io.onedev.server.web.page.project.pullrequests.requestdetail;import static io.onedev.server.model.support.MergeStrategy.ALWAYS_MERGE;import static io.onedev.server.model.support.MergeStrategy.REBASE_MERGE;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.javasimilarity index 86%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.javaindex 5eb97c84cc..297026931f 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.java@@ -1,11 +1,11 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail;+package io.onedev.server.web.page.project.pullrequests.requestdetail;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")public class UnreviewedChangesPanel extends GenericPanel<PullRequestUpdate> {diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UpdateChangesLink.javasimilarity index 82%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UpdateChangesLink.javaindex 83d67626c1..8d3a746c57 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UpdateChangesLink.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail;+package io.onedev.server.web.page.project.pullrequests.requestdetail;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;@@ -6,7 +6,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")public class UpdateChangesLink extends ViewStateAwarePageLink<Void> {diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.javasimilarity index 99%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.javaindex b5ee06c805..e59505bbf5 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.changes;+package io.onedev.server.web.page.project.pullrequests.requestdetail.changes;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -46,7 +46,7 @@ import io.onedev.server.web.component.diff.revision.CommentSupport;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;import io.onedev.server.web.websocket.CodeCommentChangedRegion;import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.PageDataChanged;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesResourceReference.javasimilarity index 91%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesResourceReference.javaindex 1c17f19707..4a26509c17 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.changes;+package io.onedev.server.web.page.project.pullrequests.requestdetail.changes;import java.util.List;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/request-changes.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.cssrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/request-changes.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.js b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/request-changes.jssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.jsrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/request-changes.jsdiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.javasimilarity index 95%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.javaindex 679bdba921..1bcc0f2b3b 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.codecomments;+package io.onedev.server.web.page.project.pullrequests.requestdetail.codecomments;import org.apache.wicket.model.IModel;import org.apache.wicket.request.IRequestHandler;@@ -13,7 +13,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.comment.CodeCommentFilter;import io.onedev.server.web.component.comment.CodeCommentListPanel;-import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.javasimilarity index 97%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.javaindex 6dc3a02e50..49c896972b 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview;+package io.onedev.server.web.page.project.pullrequests.requestdetail.mergepreview;import java.io.Serializable;import java.util.Collection;@@ -29,8 +29,8 @@ import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.commit.CommitDetailPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketRegion;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewResourceReference.javasimilarity index 78%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewResourceReference.javaindex 804fda0f69..6e285f1b99 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview;+package io.onedev.server.web.page.project.pullrequests.requestdetail.mergepreview;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/merge-preview.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.cssrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/merge-preview.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/PullRequestActivity.javasimilarity index 78%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/PullRequestActivity.javaindex 38773ee001..af5b68255b 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/PullRequestActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview;import java.io.Serializable;import java.util.Date;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.javasimilarity index 95%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.javaindex c868a86753..a6fe4aba42 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview;import java.util.ArrayList;import java.util.Arrays;@@ -56,14 +56,14 @@ import io.onedev.server.web.component.comment.ProjectAttachmentSupport;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.requestreviewer.ReviewerListPanel;import io.onedev.server.web.component.verification.RequiredVerificationsPanel;-import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.CommentedActivity;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.OpenedActivity;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.ReferencedActivity;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.RequestCommentDeleted;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.StatusChangeActivity;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.UpdatedActivity;-import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity.CommentedActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity.OpenedActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity.ReferencedActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity.RequestCommentDeleted;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity.StatusChangeActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity.UpdatedActivity;+import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.websocket.PageDataChanged;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewResourceReference.javasimilarity index 80%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewResourceReference.javaindex 11f5961ab4..16127a9e71 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/SinceChangesLink.javasimilarity index 93%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/SinceChangesLink.javaindex d8f6928286..6b7693b3d3 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/SinceChangesLink.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview;import java.util.Date;@@ -11,7 +11,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedActivity.javasimilarity index 84%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedActivity.javaindex 082418196f..0749dc1bd9 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.manager.PullRequestCommentManager;import io.onedev.server.model.PullRequestComment;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class CommentedActivity implements PullRequestActivity {diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.javasimilarity index 97%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.javaindex f4ebb9835d..83edfbf6e3 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -30,7 +30,7 @@ import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.SinceChangesLink;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.SinceChangesLink;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/OpenedActivity.javasimilarity index 83%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/OpenedActivity.javaindex 88aef7c8c3..8a812f173a 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/OpenedActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.PullRequest;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class OpenedActivity implements PullRequestActivity {diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/OpenedPanel.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/OpenedPanel.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/OpenedPanel.javasimilarity index 98%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/OpenedPanel.javaindex 8874ea5e89..50c948a686 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/OpenedPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedActivity.javasimilarity index 84%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedActivity.javaindex 9e9e203022..9aadb81117 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.manager.PullRequestReferenceManager;import io.onedev.server.model.PullRequestReference;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class ReferencedActivity implements PullRequestActivity {diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.javasimilarity index 90%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.javaindex b87ac30b78..5af403433e 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.GenericPanel;@@ -12,7 +12,7 @@ import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.requeststatus.RequestStatusPanel;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;import io.onedev.server.web.util.DateUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/RequestCommentDeleted.javasimilarity index 72%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/RequestCommentDeleted.javaindex 1d504c4221..8aa05c7c7f 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/RequestCommentDeleted.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/StatusChangeActivity.javasimilarity index 85%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/StatusChangeActivity.javaindex 201093c075..68661f4bdd 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/StatusChangeActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.manager.PullRequestStatusChangeManager;import io.onedev.server.model.PullRequestStatusChange;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class StatusChangeActivity implements PullRequestActivity {diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/StatusChangePanel.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/StatusChangePanel.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/StatusChangePanel.javasimilarity index 97%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/StatusChangePanel.javaindex 88bd5167c6..26421a6476 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/StatusChangePanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -32,7 +32,7 @@ import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.SinceChangesLink;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.SinceChangesLink;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/UpdatedActivity.javasimilarity index 83%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/UpdatedActivity.javaindex 5ace59ecf3..7a2381fb1c 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/UpdatedActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import java.util.Date;@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.PullRequestActivity;@SuppressWarnings("serial")public class UpdatedActivity implements PullRequestActivity {diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/UpdatedPanel.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/UpdatedPanel.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/UpdatedPanel.javasimilarity index 96%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/UpdatedPanel.javaindex 687713aa81..a898f91c2a 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/UpdatedPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity;+package io.onedev.server.web.page.project.pullrequests.requestdetail.overview.activity;import java.util.List;import java.util.Map;@@ -32,7 +32,7 @@ import io.onedev.server.web.component.commitmessage.ExpandableCommitMessagePanelimport io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.verification.VerificationStatusPanel;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;@SuppressWarnings("serial")class UpdatedPanel extends GenericPanel<PullRequestUpdate> {diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/request-overview.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/request-overview.cssrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/request-overview.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/request-detail.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/request-detail.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/request-detail.cssrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/request-detail.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.htmlsimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.htmlrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.htmldiff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.javasimilarity index 97%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.javaindex d431bdef95..ee9445c9cd 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestlist;+package io.onedev.server.web.page.project.pullrequests.requestlist;import java.util.ArrayList;import java.util.Date;@@ -50,9 +50,9 @@ import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.requeststatus.RequestStatusPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.pullrequest.newrequest.NewRequestPage;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;-import io.onedev.server.web.page.project.pullrequest.requestlist.SearchOption.Status;+import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.pullrequests.requestlist.SearchOption.Status;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.PagingHistorySupport;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListResourceReference.javasimilarity index 81%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListResourceReference.javaindex 53b1231d40..0249a6cca4 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestlist;+package io.onedev.server.web.page.project.pullrequests.requestlist;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SearchOption.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SearchOption.javasimilarity index 98%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SearchOption.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SearchOption.javaindex fdf73b1700..4ddd19c6a1 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SearchOption.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SearchOption.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestlist;+package io.onedev.server.web.page.project.pullrequests.requestlist;import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget;import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SortOption.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SortOption.javasimilarity index 96%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SortOption.javarename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SortOption.javaindex c8a0792611..b323af34c7 100644--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SortOption.java+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SortOption.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequest.requestlist;+package io.onedev.server.web.page.project.pullrequests.requestlist;import java.io.Serializable;diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/request-list.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.csssimilarity index 100%rename from web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/request-list.cssrename to web/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.cssdiff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.javaindex b420d5f9c8..0b7ce24dcf 100644--- a/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.component.sidebar.SidebarPanel;+import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.project.ProjectPage;@@ -17,6 +17,7 @@ import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizatimport io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;+import io.onedev.server.web.page.project.setting.issuecustomfields.IssueCustomFieldsPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;@SuppressWarnings("serial")@@ -35,7 +36,7 @@ public abstract class ProjectSettingPage extends ProjectPage {protected void onInitialize() {super.onInitialize();- add(new SidebarPanel("projectSettingSidebar", null) {+ add(new SideBar("projectSettingSidebar", null) {@Overrideprotected List<? extends Tab> newTabs() {@@ -45,6 +46,7 @@ public abstract class ProjectSettingPage extends ProjectPage {tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-exchange", CommitMessageTransformPage.class));+ tabs.add(new ProjectSettingTab("Issue Custom Fields", "fa fa-fw fa-list", IssueCustomFieldsPage.class));return tabs;}diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.javaindex dd8ef4366d..ae739f4914 100644--- a/web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java@@ -12,7 +12,7 @@ import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.CommitMessageTransformSetting;import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.reflection.ReflectionPropertyEditor;+import io.onedev.server.web.editable.bean.BeanPropertyEditor;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")@@ -36,7 +36,7 @@ public class CommitMessageTransformPage extends ProjectSettingPage {}};- form.add(new ReflectionPropertyEditor("editor", new PropertyDescriptor(Project.class, "commitMessageTransformSetting"), new IModel<Serializable>() {+ form.add(new BeanPropertyEditor("editor", new PropertyDescriptor(Project.class, "commitMessageTransformSetting"), new IModel<Serializable>() {@Overridepublic void detach() {diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.javaindex cda63bd44e..f23ba912c9 100644--- a/web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java@@ -24,7 +24,7 @@ public class GeneralSettingPage extends ProjectSettingPage {private String oldName;- private BeanEditor<?> editor;+ private BeanEditor editor;public GeneralSettingPage(PageParameters params) {super(params);diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.html b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.htmlnew file mode 100644index 0000000000..f5148705ef--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <form wicket:id="form" class="fieldspec-edit leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Edit Custom Field+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.java b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.javanew file mode 100644index 0000000000..6b60d1d080--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.java@@ -0,0 +1,172 @@+package io.onedev.server.web.page.project.setting.issuecustomfields;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.OneDev;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.util.input.Input;+import io.onedev.server.util.input.InputContext;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;++@SuppressWarnings("serial")+abstract class FieldEditPanel extends Panel implements InputContext {++ private final int fieldIndex;++ public FieldEditPanel(String id, int fieldIndex) {+ super(id);++ this.fieldIndex = fieldIndex;+ }++ private Project getProject() {+ ProjectPage page = (ProjectPage) getPage();+ return page.getProject();+ }++ @Nullable+ private Input getField(String fieldName) {+ for (Input field: getFields()) {+ if (field.getName().equals(fieldName))+ return field;+ }+ return null;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ FieldSpecBean bean = new FieldSpecBean();+ if (fieldIndex != -1)+ bean.setFieldSpec(SerializationUtils.clone(getFields().get(fieldIndex)));++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(FieldEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ BeanEditor editor = BeanContext.editBean("editor", bean);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ Input field = bean.getFieldSpec();+ if (fieldIndex != -1) {+ Input oldField = getFields().get(fieldIndex);+ if (!field.getName().equals(oldField.getName()) && getField(field.getName()) != null) {+ editor.getErrorContext(new PathSegment.Property("fieldSpec"))+ .getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another field");+ }+ } else if (getField(field.getName()) != null) {+ editor.getErrorContext(new PathSegment.Property("fieldSpec"))+ .getErrorContext(new PathSegment.Property("name"))+ .addError("This name has already been used by another field");+ }++ if (!editor.hasErrors(true)) {+ if (fieldIndex != -1) {+ Input oldField = getFields().get(fieldIndex);+ if (!field.getName().equals(oldField.getName())) {+ for (Input eachField: getFields())+ eachField.onInputRename(oldField.getName(), field.getName());+ }+ getFields().set(fieldIndex, bean.getFieldSpec());+ } else {+ getFields().add(bean.getFieldSpec());+ }+ getProject().getIssueWorkflow().setFieldSpecs(getFields());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ onSave(target);+ } else {+ target.add(form);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(FieldEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);++ add(form);+ }++ protected abstract List<Input> getFields();++ protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++ @Override+ public Map<String, Input> getInputs() {+ Map<String, Input> inputs = new LinkedHashMap<>();+ int currentIndex = 0;+ for (Input field: getFields()) {+ if (currentIndex != fieldIndex)+ inputs.put(field.getName(), field);+ currentIndex++;+ }+ return inputs;+ }++ @Override+ public List<String> getScenarios() {+ return getProject().getIssueWorkflow().getScenarios();+ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldSpecBean.java b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldSpecBean.javanew file mode 100644index 0000000000..59b4d7e893--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldSpecBean.java@@ -0,0 +1,27 @@+package io.onedev.server.web.page.project.setting.issuecustomfields;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.input.Input;++@Editable+public class FieldSpecBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private Input fieldSpec;++ @Editable(name="Type")+ @NotNull+ public Input getFieldSpec() {+ return fieldSpec;+ }++ public void setFieldSpec(Input fieldSpec) {+ this.fieldSpec = fieldSpec;+ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.html b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.htmlnew file mode 100644index 0000000000..8565772b18--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.html@@ -0,0 +1,25 @@+<wicket:extend>+ <div class="issue-custom-fields list">+ <div class="head clearfix">+ <div class="pull-left">+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>+ </div>+ </div>+ <table wicket:id="issueCustomFields" class="table table-hover table-condensed"></table>+ </div>+ <wicket:fragment wicket:id="nameColumnFrag">+ <span class="handle fa fa-arrows" title="Drag to reorder fields"></span>+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="otherColumnFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="viewFieldFrag">+ <div class="actions">+ <a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>+ <a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>+ </div>+ <div wicket:id="feedback"></div>+ <div wicket:id="viewer"></div>+ </wicket:fragment>+</wicket:extend>diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.javanew file mode 100644index 0000000000..d243e48c57--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.java@@ -0,0 +1,292 @@+package io.onedev.server.web.page.project.setting.issuecustomfields;++import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.util.editable.EditableUtils;+import io.onedev.server.util.input.Input;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.layout.SideFloating;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;+import io.onedev.utils.StringUtils;+import jersey.repackaged.com.google.common.collect.Sets;++@SuppressWarnings("serial")+public class IssueCustomFieldsPage extends ProjectSettingPage {++ private final List<Input> fields;++ private DataTable<Input, Void> fieldsTable;++ public IssueCustomFieldsPage(PageParameters params) {+ super(params);++ fields = getProject().getIssueWorkflow().getFieldSpecs();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ModalLink("addNew") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new FieldEditPanel(id, -1) {++ @Override+ protected void onSave(AjaxRequestTarget target) {+ target.add(fieldsTable);+ modal.close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected List<Input> getFields() {+ return fields;+ }++ };+ }++ });++ List<IColumn<Input, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<Input, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<Input>> cellItem, String componentId, IModel<Input> rowModel) {+ cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getName(), true));+ }+ });++ columns.add(new AbstractColumn<Input, Void>(Model.of("Type")) {++ @Override+ public void populateItem(Item<ICellPopulator<Input>> cellItem, String componentId, IModel<Input> rowModel) {+ Input field = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, rowModel, EditableUtils.getName(field.getClass()), false));+ }+ });++ columns.add(new AbstractColumn<Input, Void>(Model.of("Applicable Issue States")) {++ @Override+ public void populateItem(Item<ICellPopulator<Input>> cellItem, String componentId, IModel<Input> rowModel) {+ Input field = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, rowModel, StringUtils.join(field.getScenarios(), ", "), false));+ }+ });++ columns.add(new AbstractColumn<Input, Void>(Model.of("Description")) {++ @Override+ public void populateItem(Item<ICellPopulator<Input>> cellItem, String componentId, IModel<Input> rowModel) {+ cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getDescription(), false));+ }++ });++ IDataProvider<Input> dataProvider = new ListDataProvider<Input>() {++ @Override+ protected List<Input> getData() {+ return fields;+ }++ };++ add(fieldsTable = new DataTable<Input, Void>("issueCustomFields", columns, dataProvider, Integer.MAX_VALUE));+ fieldsTable.addTopToolbar(new HeadersToolbar<Void>(fieldsTable, null));+ fieldsTable.addBottomToolbar(new NoRecordsToolbar(fieldsTable));+ fieldsTable.setOutputMarkupId(true);++ fieldsTable.add(new SortBehavior() {++ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ Collections.swap(fields, fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ Collections.swap(fields, fromIndex-i, fromIndex-i-1);+ }++ getProject().getIssueWorkflow().setFieldSpecs(fields);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ target.add(fieldsTable);+ }++ }.sortable("tbody").handle(".handle").helperClass("sort-helper"));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssueCustomFieldsResourceReference()));+ }++ public int getFieldIndex(String fieldName) {+ int index = 0;+ for (Input field: fields) {+ if (field.getName().equals(fieldName))+ break;+ index++;+ }+ return index;+ }++ private class ColumnFragment extends Fragment {++ private final int index;++ private final String label;++ public ColumnFragment(String id, IModel<Input> model, String label, boolean nameColumn) {+ super(id, nameColumn?"nameColumnFrag":"otherColumnFrag", IssueCustomFieldsPage.this, model);+ this.index = getFieldIndex(getField().getName());+ this.label = label;+ }++ private Input getField() {+ return (Input) getDefaultModelObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ AjaxLink<Void> link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new SideFloating(target, SideFloating.Placement.RIGHT) {++ @Override+ protected String getTitle() {+ return getField().getName() + " (type: " + EditableUtils.getName(getField().getClass()) + ")";+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", "issue-custom-field"));+ }++ @Override+ protected Component newBody(String id) {+ SideFloating sideFloating = this;+ Fragment fragment = new Fragment(id, "viewFieldFrag", IssueCustomFieldsPage.this);+ fragment.add(BeanContext.viewBean("viewer", getField(), Sets.newHashSet("name")));+ fragment.add(new ModalLink("edit") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ sideFloating.close();+ return new FieldEditPanel(id, index) {++ @Override+ protected void onSave(AjaxRequestTarget target) {+ target.add(fieldsTable);+ modal.close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected List<Input> getFields() {+ return fields;+ }++ };+ }++ });+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this field?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ for (Input field: fields) {+ if (field.isUsingInput(getField().getName())) {+ fragment.error("This field is still being used by field \"" + field.getName() + "\"");+ target.add(fragment);+ return;+ }+ }++ fields.remove(index);+ getProject().getIssueWorkflow().setFieldSpecs(fields);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ target.add(fieldsTable);+ close();+ }++ });++ fragment.add(new NotificationPanel("feedback", fragment));+ fragment.setOutputMarkupId(true);++ return fragment;+ }++ };+ }++ };+ if (label != null)+ link.add(new Label("label", label));+ else+ link.add(new Label("label", " ").setEscapeModelStrings(false));+ add(link);+ }++ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.properties b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.propertiesnew file mode 100644index 0000000000..1e0985b38a--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.properties@@ -0,0 +1,7 @@+resource.input.scenariosName=Applicable Issue States+resource.input.scenariosDescription=This field will be prompted for user input when issue transits to specified states here+resource.input.dependOnOtherInput=Depend on other field+resource.input.whenInput=When field+resource.input.description=Optionally describes the custom field+resource.input.showCondition=Enable if visibility of this field depends on another field+resource.input.allowEmpty=Whether or not this field accepts empty value\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsResourceReference.javanew file mode 100644index 0000000000..c4bb5a38dd--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.setting.issuecustomfields;++import org.apache.wicket.request.resource.CssResourceReference;++public class IssueCustomFieldsResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueCustomFieldsResourceReference() {+ super(IssueCustomFieldsResourceReference.class, "issue-custom-fields.css");+ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/issue-custom-fields.css b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/issue-custom-fields.cssnew file mode 100644index 0000000000..7e70e5ff93--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/issue-custom-fields.css@@ -0,0 +1,49 @@+.fieldspec-edit .property-showCondition>.value label {+ font-weight: normal;+}++#project-setting .issue-custom-fields table td {+ padding: 0;+}+#project-setting .issue-custom-fields table td.norecords-td {+ padding: 5px;+}+#project-setting .issue-custom-fields table a {+ display: block;+ color: #666;+ text-decoration: none;+ padding: 5px;+}+#project-setting .issue-custom-fields table>tbody>tr>td:first-child>div {+ position: relative;+ top: 0;+}+#project-setting .issue-custom-fields table>tbody>tr>td:first-child>div>.handle {+ position: absolute;+ top: 8px;+}+#project-setting .issue-custom-fields table>tbody>tr>td:first-child>div>a {+ margin-left: 16px;+}++.floating.issue-custom-field {+ width: 600px;+}+.floating.issue-custom-field .actions {+ margin-bottom: 12px;+}++.floating.issue-custom-field .property-showCondition .property-inputName td.name,+.floating.issue-custom-field .property-choicesProvider .property-inputName td.name,+.floating.issue-custom-field .property-choicesOfOtherValues td.name,+.floating.issue-custom-field .property-defaultValueProvider .property-inputName td.name,+.floating.issue-custom-field .property-defaultValueOfOtherValues td.name {+ border-right: none;+ text-align: left;+}++.fieldspec-edit .property-choicesProvider>.value label.name,+.fieldspec-edit .property-choicesProvider>.value .bean.list thead th,+.property-nameOfEmptyValue .control-label {+ font-weight: normal;+}diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/web/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex b5d378d34d..db043b6b72 100644--- a/web/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -46,9 +46,9 @@background-color: #EBEBEB;border-color: #ADADAD;}-#project-setting .panel-list .concrete.list td.path,-#project-setting .panel-list .concrete.list td.reviewerNames,-#project-setting .panel-list .concrete.list td.reviewAppointment {+#project-setting .panel-list .bean.list td.path,+#project-setting .panel-list .bean.list td.reviewerNames,+#project-setting .panel-list .bean.list td.reviewAppointment {width: 45%;}@@ -70,4 +70,5 @@}#project-setting .authorization.list .head .select2-container {width: 240px;-}\ No newline at end of file+}+diff --git a/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.javaindex 470162120c..1bb658154e 100644--- a/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java@@ -26,8 +26,8 @@ import io.onedev.server.OneDev;import io.onedev.server.git.Contribution;import io.onedev.server.git.Contributor;import io.onedev.server.manager.CommitInfoManager;+import io.onedev.server.util.Constants;import io.onedev.server.util.Day;-import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;@@ -84,7 +84,7 @@ public class ProjectContribsPage extends ProjectStatsPage {if (StringUtils.isNotBlank(fromDayText)) {try {- WebConstants.DATE_FORMATTER.parseDateTime(fromDayText);+ Constants.DATE_FORMATTER.parseDateTime(fromDayText);} catch (IllegalArgumentException e) {error("Invalid fromDay");}@@ -92,7 +92,7 @@ public class ProjectContribsPage extends ProjectStatsPage {if (StringUtils.isNotBlank(toDayText)) {try {- WebConstants.DATE_FORMATTER.parseDateTime(toDayText);+ Constants.DATE_FORMATTER.parseDateTime(toDayText);} catch (IllegalArgumentException e) {error("Invalid toDay");}@@ -121,14 +121,14 @@ public class ProjectContribsPage extends ProjectStatsPage {if (size != 0) {Day fromDay;if (StringUtils.isNotBlank(fromDayText)) {- fromDay = new Day(WebConstants.DATE_FORMATTER.parseDateTime(fromDayText));+ fromDay = new Day(Constants.DATE_FORMATTER.parseDateTime(fromDayText));} else {fromDay = overallContributions.get(0).getDay();}Day toDay;if (StringUtils.isNotBlank(toDayText)) {- toDay = new Day(WebConstants.DATE_FORMATTER.parseDateTime(toDayText));+ toDay = new Day(Constants.DATE_FORMATTER.parseDateTime(toDayText));} else {toDay = overallContributions.get(size-1).getDay();}diff --git a/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex f6b0b7e70b..1e164c3044 100644--- a/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -57,7 +57,7 @@ import io.onedev.server.web.component.verification.VerificationStatusPanel;import io.onedev.server.web.page.project.NoCommitsPage;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.commit.CommitDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import io.onedev.utils.StringUtils;diff --git a/web/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/web/src/main/java/io/onedev/server/web/page/security/RegisterPage.javaindex f341ee637f..111a1c5e07 100644--- a/web/src/main/java/io/onedev/server/web/page/security/RegisterPage.java+++ b/web/src/main/java/io/onedev/server/web/page/security/RegisterPage.java@@ -36,7 +36,7 @@ public class RegisterPage extends BasePage {super.onInitialize();final User user = new User();- final BeanEditor<?> editor = BeanContext.editBean("editor", user);+ final BeanEditor editor = BeanContext.editBean("editor", user);Form<?> form = new Form<Void>("form") {diff --git a/web/src/main/java/io/onedev/server/web/page/test/Bean.java b/web/src/main/java/io/onedev/server/web/page/test/Bean.javanew file mode 100644index 0000000000..dfb03cd1f6--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/page/test/Bean.java@@ -0,0 +1,25 @@+package io.onedev.server.web.page.test;++import java.io.Serializable;++import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.Script;++@Editable+public class Bean implements Serializable {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable+ @Script+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++}diff --git a/web/src/main/java/io/onedev/server/web/page/test/TestPage.html b/web/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex b47194918b..3861deb6fa 100644--- a/web/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/web/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,2 +1,9 @@<wicket:extend>+ <div class="center-box">+ <form wicket:id="form">+ <div wicket:id="editor"></div>+ <button type="submit" class="btn btn-default">Submit</button>+ </form>+ <div wicket:id="viewer"></div>+ </div></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/page/test/TestPage.java b/web/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex f4557125f8..d32cb2889a 100644--- a/web/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/web/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -1,5 +1,8 @@package io.onedev.server.web.page.test;+import org.apache.wicket.markup.html.form.Form;++import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -8,6 +11,17 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();++ Bean bean = new Bean();+ Form<?> form = new Form<Void>("form") {++ };+ form.add(BeanContext.editBean("editor", bean));+ add(form);++ bean.setScript("public class Test {}");++ add(BeanContext.viewBean("viewer", bean));}}diff --git a/web/src/main/java/io/onedev/server/web/page/user/NewUserPage.java b/web/src/main/java/io/onedev/server/web/page/user/NewUserPage.javaindex 3b12c78e8d..2d1eec601e 100644--- a/web/src/main/java/io/onedev/server/web/page/user/NewUserPage.java+++ b/web/src/main/java/io/onedev/server/web/page/user/NewUserPage.java@@ -37,7 +37,7 @@ public class NewUserPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- BeanEditor<?> editor = BeanContext.editBean("editor", user);+ BeanEditor editor = BeanContext.editBean("editor", user);Form<?> form = new Form<Void>("form") {diff --git a/web/src/main/java/io/onedev/server/web/page/user/TaskListPage.java b/web/src/main/java/io/onedev/server/web/page/user/TaskListPage.javaindex fe7c9f5cb6..0da7fe4676 100644--- a/web/src/main/java/io/onedev/server/web/page/user/TaskListPage.java+++ b/web/src/main/java/io/onedev/server/web/page/user/TaskListPage.java@@ -31,7 +31,7 @@ import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.SelectionColumn;import io.onedev.server.web.component.link.BranchLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;import io.onedev.server.web.util.DateUtils;import io.onedev.server.web.util.PagingHistorySupport;diff --git a/web/src/main/java/io/onedev/server/web/page/user/UserPage.java b/web/src/main/java/io/onedev/server/web/page/user/UserPage.javaindex ac439955f3..e41c6f8227 100644--- a/web/src/main/java/io/onedev/server/web/page/user/UserPage.java+++ b/web/src/main/java/io/onedev/server/web/page/user/UserPage.java@@ -21,7 +21,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ComponentRenderer;import io.onedev.server.web.component.avatar.Avatar;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.sidebar.SidebarPanel;+import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.layout.LayoutPage;@@ -46,7 +46,7 @@ public abstract class UserPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- add(new SidebarPanel("sidebar", "user.miniSidebar") {+ add(new SideBar("sidebar", "user.miniSidebar") {@Overrideprotected Component newHead(String componentId) {diff --git a/web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java b/web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.javaindex db6c16b8ac..74e7f16ab6 100644--- a/web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java+++ b/web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java@@ -24,7 +24,7 @@ import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class UserProfilePage extends UserPage {- private BeanEditor<?> editor;+ private BeanEditor editor;private String oldName;diff --git a/web/src/main/java/io/onedev/server/web/util/Animation.java b/web/src/main/java/io/onedev/server/web/util/Animation.javanew file mode 100644index 0000000000..08a32999d6--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/util/Animation.java@@ -0,0 +1,5 @@+package io.onedev.server.web.util;++public enum Animation {+ LEFT, RIGHT, TOP, BOTTOM+}diff --git a/web/src/main/java/io/onedev/server/web/util/ComponentContext.java b/web/src/main/java/io/onedev/server/web/util/ComponentContext.javanew file mode 100644index 0000000000..bef401a964--- /dev/null+++ b/web/src/main/java/io/onedev/server/web/util/ComponentContext.java@@ -0,0 +1,39 @@+package io.onedev.server.web.util;++import org.apache.wicket.Component;+import org.apache.wicket.Page;++import io.onedev.server.model.Project;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.input.InputContext;+import io.onedev.server.web.page.project.ProjectPage;++public class ComponentContext extends OneContext {++ private Component component;++ public ComponentContext(Component component) {+ this.component = component;+ }++ @Override+ public Project getProject() {+ Page page = component.getPage();+ if (page instanceof ProjectPage)+ return ((ProjectPage)page).getProject();+ else+ return null;+ }++ @Override+ public EditContext getEditContext(int level) {+ return WicketUtils.findParents(component, EditContext.class).get(level);+ }++ @Override+ public InputContext getInputContext() {+ return WicketUtils.findInnermost(component, InputContext.class);+ }++}diff --git a/web/src/main/java/io/onedev/server/web/util/DateUtils.java b/web/src/main/java/io/onedev/server/web/util/DateUtils.javaindex 7b4d8ca676..12bea5b6d1 100644--- a/web/src/main/java/io/onedev/server/web/util/DateUtils.java+++ b/web/src/main/java/io/onedev/server/web/util/DateUtils.java@@ -5,7 +5,7 @@ import java.util.Date;import org.joda.time.DateTime;import org.ocpsoft.prettytime.PrettyTime;-import io.onedev.server.web.WebConstants;+import io.onedev.server.util.Constants;public class DateUtils extends org.apache.commons.lang3.time.DateUtils {@@ -16,11 +16,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {}public static String formatDate(Date date) {- return WebConstants.DATE_FORMATTER.print(new DateTime(date));+ return Constants.DATE_FORMATTER.print(new DateTime(date));}public static String formatDateTime(Date date) {- return WebConstants.DATETIME_FORMATTER.print(new DateTime(date));+ return Constants.DATETIME_FORMATTER.print(new DateTime(date));}}\ No newline at end of filediff --git a/web/src/main/java/io/onedev/server/web/util/WicketUtils.java b/web/src/main/java/io/onedev/server/web/util/WicketUtils.javaindex ddb377c60a..e78b5584f5 100644--- a/web/src/main/java/io/onedev/server/web/util/WicketUtils.java+++ b/web/src/main/java/io/onedev/server/web/util/WicketUtils.java@@ -1,5 +1,8 @@package io.onedev.server.web.util;+import java.util.ArrayList;+import java.util.List;+import javax.annotation.Nullable;import javax.servlet.http.HttpServletRequest;@@ -32,7 +35,47 @@ public class WicketUtils {return null;}}++ @Nullable+ public static <T> T findOutermost(Component component, Class<T> clazz) {+ List<T> parents = findParents(component, clazz);+ if (!parents.isEmpty())+ return parents.get(parents.size()-1);+ else+ return null;+ }++ @Nullable+ public static <T> T findInnermost(Component component, Class<T> clazz) {+ List<T> parents = findParents(component, clazz);+ if (!parents.isEmpty())+ return parents.get(0);+ else+ return null;+ }++ /**+ * Get list of parent components (including current component) of specified clazz+ * @param component+ * starting component+ * @param clazz+ * clazz to check+ * @return+ * list of parent components of specified clazz, with inner component comes first+ */+ @SuppressWarnings("unchecked")+ public static <T> List<T> findParents(Component component, Class<T> clazz) {+ List<T> parents = new ArrayList<>();+ Component current = component;+ do {+ if (clazz.isAssignableFrom(current.getClass()))+ parents.add((T) current);+ current = current.getParent();+ } while (current != null);+ return parents;+ }+@Nullablepublic static PageKey getPageKey() {Page page = getPage();diff --git a/web/src/main/java/io/onedev/server/web/util/mapper/OneDevPageMapper.java b/web/src/main/java/io/onedev/server/web/util/mapper/OnePageMapper.javasimilarity index 85%rename from web/src/main/java/io/onedev/server/web/util/mapper/OneDevPageMapper.javarename to web/src/main/java/io/onedev/server/web/util/mapper/OnePageMapper.javaindex 7609eccbf9..d60efedc3a 100644--- a/web/src/main/java/io/onedev/server/web/util/mapper/OneDevPageMapper.java+++ b/web/src/main/java/io/onedev/server/web/util/mapper/OnePageMapper.java@@ -7,9 +7,9 @@ import org.apache.wicket.request.mapper.info.PageComponentInfo;import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;import org.apache.wicket.request.mapper.parameter.PageParameters;-public class OneDevPageMapper extends MountedMapper {+public class OnePageMapper extends MountedMapper {- public OneDevPageMapper(String mountPath, Class<? extends IRequestablePage> pageClass) {+ public OnePageMapper(String mountPath, Class<? extends IRequestablePage> pageClass) {super(mountPath, pageClass);}diff --git a/web/src/main/java/io/onedev/server/web/util/mapper/OneDevResourceMapper.java b/web/src/main/java/io/onedev/server/web/util/mapper/OneResourceMapper.javasimilarity index 80%rename from web/src/main/java/io/onedev/server/web/util/mapper/OneDevResourceMapper.javarename to web/src/main/java/io/onedev/server/web/util/mapper/OneResourceMapper.javaindex b0d5bffbf3..85b06f558f 100644--- a/web/src/main/java/io/onedev/server/web/util/mapper/OneDevResourceMapper.java+++ b/web/src/main/java/io/onedev/server/web/util/mapper/OneResourceMapper.java@@ -6,9 +6,9 @@ import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.ResourceReference;-public class OneDevResourceMapper extends ResourceMapper {+public class OneResourceMapper extends ResourceMapper {- public OneDevResourceMapper(String path, ResourceReference resourceReference) {+ public OneResourceMapper(String path, ResourceReference resourceReference) {super(path, resourceReference);}diff --git a/web/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java b/web/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.javaindex f1e21e7a63..0c9c4a5d3f 100644--- a/web/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java+++ b/web/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java@@ -6,7 +6,7 @@ import org.jsoup.nodes.Document;import io.onedev.server.model.PullRequest;import io.onedev.server.util.markdown.MarkdownProcessor;import io.onedev.server.util.markdown.PullRequestParser;-import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;public class PullRequestProcessor extends PullRequestParser implements MarkdownProcessor {diff --git a/web/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/web/src/main/java/org/apache/wicket/application/AbstractClassResolver.javanew file mode 100644index 0000000000..fd7009ec65--- /dev/null+++ b/web/src/main/java/org/apache/wicket/application/AbstractClassResolver.java@@ -0,0 +1,164 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.wicket.application;++import java.lang.ref.WeakReference;+import java.net.URL;+import java.util.Enumeration;+import java.util.Iterator;+import java.util.Set;+import java.util.TreeSet;+import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.ConcurrentMap;++import org.apache.wicket.Application;+import org.apache.wicket.WicketRuntimeException;+import org.apache.wicket.util.collections.UrlExternalFormComparator;++import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;++/**+ * An abstract implementation of a {@link IClassResolver} which uses a {@link ClassLoader} for+ * resolving classes.+ *+ * @see org.apache.wicket.settings.ApplicationSettings#getClassResolver()+ *+ * @author Juergen Donnerstag+ * @author Jonathan Locke+ */+public abstract class AbstractClassResolver implements IClassResolver+{+ /**+ * Usually class loaders implement more efficient caching strategies than we could possibly do,+ * but we experienced synchronization issue resulting in stack traces like:+ * java.lang.LinkageError: duplicate class definition:+ *+ * <pre>+ * wicket/examples/repeater/RepeatingPage at java.lang.ClassLoader.defineClass1(Native Method)+ * </pre>+ *+ * This problem has gone since we synchronize the access.+ */+ private final ConcurrentMap<String, WeakReference<Class<?>>> classes = new ConcurrentHashMap<>();++ @Override+ public final Class<?> resolveClass(final String className) throws ClassNotFoundException+ {+ Class<?> clazz = OneDev.getInstance(IssueManager.class).loadCustomFieldsBeanClass(className);++ if (clazz != null)+ return clazz;++ WeakReference<Class<?>> ref = classes.get(className);++ // Might be garbage-collected between getting the WeakRef and retrieving+ // the Class from it.+ if (ref != null)+ {+ clazz = ref.get();+ }+ if (clazz == null)+ {+ switch (className)+ {+ case "byte":+ clazz = byte.class;+ break;+ case "short":+ clazz = short.class;+ break;+ case "int":+ clazz = int.class;+ break;+ case "long":+ clazz = long.class;+ break;+ case "float":+ clazz = float.class;+ break;+ case "double":+ clazz = double.class;+ break;+ case "boolean":+ clazz = boolean.class;+ break;+ case "char":+ clazz = char.class;+ break;+ default:+ // synchronize on the only class member to load only one class at a time and+ // prevent LinkageError. See above for more info+ synchronized (classes)+ {+ clazz = Class.forName(className, false, getClassLoader());+ if (clazz == null)+ {+ throw new ClassNotFoundException(className);+ }+ }+ classes.put(className, new WeakReference<Class<?>>(clazz));+ break;+ }+ }+ return clazz;+ }++ @Override+ public Iterator<URL> getResources(final String name)+ {+ Set<URL> resultSet = new TreeSet<>(new UrlExternalFormComparator());++ try+ {+ // Try the classloader for the wicket jar/bundle+ Enumeration<URL> resources = Application.class.getClassLoader().getResources(name);+ loadResources(resources, resultSet);++ // Try the classloader for the user's application jar/bundle+ resources = Application.get().getClass().getClassLoader().getResources(name);+ loadResources(resources, resultSet);++ // Try the context class loader+ resources = getClassLoader().getResources(name);+ loadResources(resources, resultSet);+ }+ catch (Exception e)+ {+ throw new WicketRuntimeException(e);+ }++ return resultSet.iterator();+ }++ /**+ *+ * @param resources+ * @param loadedResources+ */+ private void loadResources(Enumeration<URL> resources, Set<URL> loadedResources)+ {+ if (resources != null)+ {+ while (resources.hasMoreElements())+ {+ final URL url = resources.nextElement();+ loadedResources.add(url);+ }+ }+ }+}diff --git a/web/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/web/src/main/java/org/apache/wicket/markup/html/form/FormComponent.javanew file mode 100644index 0000000000..f7562793df--- /dev/null+++ b/web/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java@@ -0,0 +1,1677 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.wicket.markup.html.form;++import java.io.Serializable;+import java.text.Format;+import java.text.SimpleDateFormat;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashMap;+import java.util.Iterator;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Locale;+import java.util.Map;+import java.util.Set;++import org.apache.wicket.Application;+import org.apache.wicket.Component;+import org.apache.wicket.IConverterLocator;+import org.apache.wicket.IGenericComponent;+import org.apache.wicket.Localizer;+import org.apache.wicket.WicketRuntimeException;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.core.util.lang.WicketObjects;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.form.AutoLabelResolver.AutoLabelMarker;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.IPropertyReflectionAwareModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;+import org.apache.wicket.util.convert.IConverter;+import org.apache.wicket.util.lang.Args;+import org.apache.wicket.util.lang.Classes;+import org.apache.wicket.util.string.StringList;+import org.apache.wicket.util.string.StringValue;+import org.apache.wicket.util.string.Strings;+import org.apache.wicket.util.string.interpolator.VariableInterpolator;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitFilter;+import org.apache.wicket.util.visit.IVisitor;+import org.apache.wicket.util.visit.Visits;+import org.apache.wicket.validation.IErrorMessageSource;+import org.apache.wicket.validation.INullAcceptingValidator;+import org.apache.wicket.validation.IValidatable;+import org.apache.wicket.validation.IValidationError;+import org.apache.wicket.validation.IValidator;+import org.apache.wicket.validation.ValidationError;+import org.apache.wicket.validation.ValidatorAdapter;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+++/**+ * An HTML form component knows how to validate itself. Validators that implement IValidator can be+ * added to the component. They will be evaluated in the order they were added and the first+ * Validator that returns an error message determines the error message returned by the component.+ * <p>+ * FormComponents are not versioned by default. If you need versioning for your FormComponents, you+ * will need to call Form.setVersioned(true), which will set versioning on for the form and all form+ * component children.+ * <p>+ * If this component is required and that fails, the error key that is used is the "Required"; if+ * the type conversion fails, it will use the key "IConverter" if the conversion failed in a+ * converter, or "ConversionError" if type was explicitly specified via {@link #setType(Class)} or a+ * {@link IPropertyReflectionAwareModel} was used. Notice that both "IConverter" and+ * "ConversionError" have a more specific variant of "key.classname" where classname is the type+ * that we failed to convert to. Classname is not full qualified, so only the actual name of the+ * class is used.+ *+ * Property expressions that can be used in error messages are:+ * <ul>+ * <li>${input}: the input the user did give</li>+ * <li>${name}: the name of the component that failed</li>+ * <li>${label}: the label of the component</li>+ * </ul>+ *+ * @author Jonathan Locke+ * @author Eelco Hillenius+ * @author Johan Compagner+ * @author Igor Vaynberg (ivaynberg)+ *+ * @param <T>+ * The model object type+ *+ */+public abstract class FormComponent<T> extends LabeledWebMarkupContainer implements+ IFormVisitorParticipant, IFormModelUpdateListener, IGenericComponent<T>+{+ private static final Logger logger = LoggerFactory.getLogger(FormComponent.class);++ /**+ * {@link IErrorMessageSource} used for error messages against this form components.+ *+ * @author ivaynberg+ */+ private class MessageSource implements IErrorMessageSource+ {+ private final Set<String> triedKeys = new LinkedHashSet<>();++ /**+ * @see org.apache.wicket.validation.IErrorMessageSource#getMessage(String, java.util.Map)+ */+ @Override+ public String getMessage(String key, Map<String, Object> vars)+ {+ final FormComponent<T> formComponent = FormComponent.this;++ // Use the following log4j config for detailed logging on the property resolution+ // process+ // log4j.logger.org.apache.wicket.resource.loader=DEBUG+ // log4j.logger.org.apache.wicket.Localizer=DEBUG++ final Localizer localizer = formComponent.getLocalizer();++ // retrieve prefix that will be used to construct message keys+ String prefix = formComponent.getValidatorKeyPrefix();+ String message;++ // first try the full form of key [form-component-id].[prefix].[key]+ String resource = getId() + "." + prefix(prefix, key);+ message = getString(localizer, resource, formComponent);++ // if not found, try a more general form (without prefix)+ // [form-component-id].[key]+ if (Strings.isEmpty(message) && Strings.isEmpty(prefix))+ {+ resource = getId() + "." + key;+ message = getString(localizer, resource, formComponent);+ }++ // If not found try a more general form [prefix].[key]+ if (Strings.isEmpty(message))+ {+ resource = prefix(prefix, key);+ message = getString(localizer, resource, formComponent);+ }++ // If not found try the most general form [key]+ if (Strings.isEmpty(message))+ {+ // Try a variation of the resource key+ message = getString(localizer, key, formComponent);+ }++ // convert empty string to null in case our default value of "" was+ // returned from localizer+ if (Strings.isEmpty(message))+ {+ message = null;+ }+ else+ {+ message = substitute(message, addDefaultVars(vars));+ }+ return message;+ }++ private String prefix(String prefix, String key)+ {+ if (!Strings.isEmpty(prefix))+ {+ return prefix + "." + key;+ }+ else+ {+ return key;+ }+ }++ /**+ *+ * @param localizer+ * @param key+ * @param component+ * @return string+ */+ private String getString(Localizer localizer, String key, Component component)+ {+ triedKeys.add(key);++ // Note: It is important that the default value of "" is+ // provided to getString() not to throw a MissingResourceException or to+ // return a default string like "[Warning: String ..."+ return localizer.getString(key, component, "");+ }++ private String substitute(String string, final Map<String, Object> vars)+ throws IllegalStateException+ {+ return new VariableInterpolator(string, Application.get()+ .getResourceSettings()+ .getThrowExceptionOnMissingResource())+ {+ private static final long serialVersionUID = 1L;++ @SuppressWarnings({ "rawtypes", "unchecked" })+ @Override+ protected String getValue(String variableName)+ {+ Object value = vars.get(variableName);++ if (value == null ||value instanceof String)+ {+ return String.valueOf(value);+ }++ IConverter converter = getConverter(value.getClass());++ if (converter == null)+ {+ return Strings.toString(value);+ }+ else+ {+ return converter.convertToString(value, getLocale());+ }+ }+ }.toString();+ }++ /**+ * Creates a new params map that additionally contains the default input, name, label+ * parameters+ *+ * @param params+ * original params map+ * @return new params map+ */+ private Map<String, Object> addDefaultVars(Map<String, Object> params)+ {+ // create and fill the new params map+ final HashMap<String, Object> fullParams;+ if (params == null)+ {+ fullParams = new HashMap<>(6);+ }+ else+ {+ fullParams = new HashMap<>(params.size() + 6);+ fullParams.putAll(params);+ }++ // add the input param if not already present+ if (!fullParams.containsKey("input"))+ {+ fullParams.put("input", getInput());+ }++ // add the name param if not already present+ if (!fullParams.containsKey("name"))+ {+ fullParams.put("name", getId());+ }++ // add the label param if not already present+ if (!fullParams.containsKey("label"))+ {+ fullParams.put("label", getLabel());+ }+ return fullParams;+ }++ /**+ * @return value of label param for this form component+ */+ private String getLabel()+ {+ final FormComponent<T> fc = FormComponent.this;+ String label = null;++ // first try the label model ...+ if (fc.getLabel() != null)+ {+ label = fc.getLabel().getObject();+ }+ // ... then try a resource of format [form-component-id] with+ // default of '[form-component-id]'+ if (label == null)+ {++ label = fc.getDefaultLabel();+ }+ return label;+ }+ }+++ /**+ * Adapter that makes this component appear as {@link IValidatable}+ *+ * @author ivaynberg+ */+ private class ValidatableAdapter implements IValidatable<T>+ {+ /**+ * @see org.apache.wicket.validation.IValidatable#error(org.apache.wicket.validation.IValidationError)+ */+ @Override+ public void error(IValidationError error)+ {+ FormComponent.this.error(error);+ }++ /**+ * @see org.apache.wicket.validation.IValidatable#getValue()+ */+ @Override+ public T getValue()+ {+ return getConvertedInput();+ }++ /**+ * @see org.apache.wicket.validation.IValidatable#isValid()+ */+ @Override+ public boolean isValid()+ {+ return FormComponent.this.isValid();+ }++ @Override+ public IModel<T> getModel()+ {+ return FormComponent.this.getModel();+ }+ }++ /**+ * The value separator+ */+ public static final String VALUE_SEPARATOR = ";";++ private static final String[] EMPTY_STRING_ARRAY = new String[] { "" };++ /** Whether or not this component's value is required (non-empty) */+ private static final short FLAG_REQUIRED = FLAG_RESERVED3;++ private static final String NO_RAW_INPUT = "[-NO-RAW-INPUT-]";++ private static final long serialVersionUID = 1L;++ /**+ * Make empty strings null values boolean. Used by AbstractTextComponent subclass.+ */+ protected static final short FLAG_CONVERT_EMPTY_INPUT_STRING_TO_NULL = FLAG_RESERVED1;++ /**+ * Visits any form components inside component if it is a container, or component itself if it+ * is itself a form component+ *+ * @param <R>+ * the type of the visitor's result+ *+ * @param component+ * starting point of the traversal+ *+ * @param visitor+ * The visitor to call+ * @return the visitor's result+ */+ public static <R> R visitFormComponentsPostOrder(Component component,+ final IVisitor<? extends FormComponent<?>, R> visitor)+ {+ return Visits.visitPostOrder(component, visitor, new IVisitFilter()+ {++ @Override+ public boolean visitChildren(Object object)+ {+ if (object instanceof IFormVisitorParticipant)+ {+ return ((IFormVisitorParticipant)object).processChildren();+ }+ return true;+ }++ @Override+ public boolean visitObject(Object object)+ {+ return (object instanceof FormComponent<?>);+ }++ });++ }++ /**+ * Visits any form components inside component if it is a container, or component itself if it+ * is itself a form component+ *+ * @param <R>+ * the type of the visitor's result+ * @param component+ * starting point of the traversal+ *+ * @param visitor+ * The visitor to call+ * @return the visitor's result+ */+ public static <R> R visitComponentsPostOrder(Component component,+ final org.apache.wicket.util.visit.IVisitor<Component, R> visitor)+ {+ Args.notNull(visitor, "visitor");++ return Visits.visitPostOrder(component, visitor, new IVisitFilter()+ {+ @Override+ public boolean visitObject(Object object)+ {+ return true;+ }++ @Override+ public boolean visitChildren(Object object)+ {+ if (object instanceof IFormVisitorParticipant)+ {+ return ((IFormVisitorParticipant)object).processChildren();+ }+ return true;+ }++ });+ }++ private T convertedInput;++ /**+ * Raw Input entered by the user or NO_RAW_INPUT if nothing is filled in.+ */+ private String rawInput = NO_RAW_INPUT;++ /**+ * Type that the raw input string will be converted to+ */+ private String typeName;++ /**+ * @see org.apache.wicket.Component#Component(String)+ */+ public FormComponent(final String id)+ {+ this(id, null);+ }++ /**+ * @param id+ * @param model+ * @see org.apache.wicket.Component#Component(String, IModel)+ */+ public FormComponent(final String id, IModel<T> model)+ {+ super(id, model);+ if (model != null)+ setConvertedInput(model.getObject());+ // the form decides whether form components are versioned or not+ // see Form.setVersioned+ setVersioned(false);+ }++ /**+ * Gets the string the component would use as a label when one was requested but no label model+ * was set via {@link #getLabel()}. The value of this string is usually set in a property file;+ * if the value is not set the default value equivalent to component id will be returned.+ *+ * @return localized label+ */+ public final String getDefaultLabel()+ {+ return getDefaultLabel(getId());+ }++ /**+ * Gets the string the component would use as a label when one was requested but no label model+ * was set via {@link #getLabel()}. The value of this string is usually set in a property file;+ * if the value is not set the {@code defaultValue} will be returned.+ *+ * @param defaultValue+ *+ * @return localized label+ */+ public final String getDefaultLabel(String defaultValue)+ {+ return getLocalizer().getString(getId(), getParent(), defaultValue);+ }+++ /**+ * Adds a validator to this form component+ *+ * @param validator+ * validator to be added+ * @return <code>this</code> for chaining+ * @throws IllegalArgumentException+ * if validator is null+ * @see IValidator+ */+ @SuppressWarnings({ "rawtypes", "unchecked" })+ public final FormComponent<T> add(final IValidator<? super T> validator)+ {+ Args.notNull(validator, "validator");++ if (validator instanceof Behavior)+ {+ add((Behavior)validator);+ }+ else+ {+ add((Behavior)new ValidatorAdapter(validator));+ }+ return this;+ }++ /**+ * Removes a validator from the form component.+ *+ * @param validator+ * validator+ * @throws IllegalArgumentException+ * if validator is null or not found+ * @see IValidator+ * @see #add(IValidator)+ * @return form component for chaining+ */+ public final FormComponent<T> remove(final IValidator<? super T> validator)+ {+ Args.notNull(validator, "validator");+ Behavior match = null;+ for (Behavior behavior : getBehaviors())+ {+ if (behavior.equals(validator))+ {+ match = behavior;+ break;+ }+ else if (behavior instanceof ValidatorAdapter)+ {+ if (((ValidatorAdapter<?>)behavior).getValidator().equals(validator))+ {+ match = behavior;+ break;+ }+ }+ }++ if (match != null)+ {+ remove(match);+ }+ else+ {+ throw new IllegalStateException(+ "Tried to remove validator that was not previously added. "+ + "Make sure your validator's equals() implementation is sufficient");+ }+ return this;+ }++ /**+ * Adds a validator to this form component.+ *+ * @param validators+ * The validator(s) to be added+ * @return This+ * @throws IllegalArgumentException+ * if validator is null+ * @see IValidator+ */+ @SafeVarargs+ public final FormComponent<T> add(final IValidator<? super T>... validators)+ {+ Args.notNull(validators, "validators");++ for (IValidator<? super T> validator : validators)+ {+ add(validator);+ }++ // return this for chaining+ return this;+ }++ /**+ * Checks if the form component's 'required' requirement is met by first checking+ * {@link #isRequired()} to see if it has to check for requirement. If that is true then by+ * default it checks if the input is null or an empty String+ * {@link Strings#isEmpty(CharSequence)}+ * <p>+ * Subclasses that overwrite this method should also call {@link #isRequired()} first.+ * </p>+ *+ * @return true if the 'required' requirement is met, false otherwise+ *+ * @see Strings#isEmpty(CharSequence)+ * @see #isInputNullable()+ */+ public boolean checkRequired()+ {+ if (isRequired())+ {+ final String input = getInput();++ // when null, check whether this is natural for that component, or+ // whether - as is the case with text fields - this can only happen+ // when the component was disabled+ if (input == null && !isInputNullable() && !isEnabledInHierarchy())+ {+ // this value must have come from a disabled field+ // do not perform validation+ return true;+ }++ // perform validation by looking whether the value is null or empty+ return !Strings.isEmpty(input);+ }+ return true;+ }++ /**+ * Clears the user input.+ */+ public final void clearInput()+ {+ rawInput = NO_RAW_INPUT;+ }++ /**+ * Reports a validation error against this form component.+ *+ * The actual error is reported by creating a {@link ValidationErrorFeedback} object that holds+ * both the validation error and the generated error message - so a custom feedback panel can+ * have access to both.+ *+ * @param error+ * validation error+ */+ public void error(IValidationError error)+ {+ Args.notNull(error, "error");++ MessageSource source = new MessageSource();+ Serializable message = error.getErrorMessage(source);++ if (message == null)+ {+ StringBuilder buffer = new StringBuilder();+ buffer.append("Could not locate error message for component: ");+ buffer.append(Classes.simpleName(getClass()));+ buffer.append("@");+ buffer.append(getPageRelativePath());+ buffer.append(" and error: ");+ buffer.append(error.toString());+ buffer.append(". Tried keys: ");+ Iterator<String> keys = source.triedKeys.iterator();+ while (keys.hasNext())+ {+ buffer.append(keys.next());+ if (keys.hasNext())+ {+ buffer.append(", ");+ }+ }+ buffer.append('.');+ message = buffer.toString();+ logger.warn(message.toString());+ }+ error(message);+ }++ /**+ * Gets the converted input. The converted input is set earlier though the implementation of+ * {@link #convertInput()}.+ *+ * {@link FormComponentPanel} often access this method when constructing their converted input+ * value which is often the combination of converted values of the embedded FormComponents+ *+ * To access the model object resulted by the full form processing, use+ * {@link #getModelObject()} instead, that is an generified version of+ * {@link #getDefaultModelObject()}+ *+ * @return value of input possibly converted into an appropriate type+ */+ public final T getConvertedInput()+ {+ return convertedInput;+ }++ /**+ * Sets the converted input. This method is typically not called by clients, unless they+ * override {@link #convertInput()}, in which case they should call this method to update the+ * input for this component instance.+ *+ * @param convertedInput+ * the converted input+ */+ public final void setConvertedInput(T convertedInput)+ {+ this.convertedInput = convertedInput;+ }++ /**+ * @return The parent form for this form component+ */+ public Form<?> getForm()+ {+ Form<?> form = Form.findForm(this);+ if (form == null)+ {+ throw new WicketRuntimeException("Could not find Form parent for " + this);+ }+ return form;+ }+++ /**+ * Gets the request parameter for this component as a string.+ *+ * @return The value in the request for this component+ */+ public String getInput()+ {+ String[] input = getInputAsArray();+ if (input == null || input.length == 0)+ {+ return null;+ }+ else+ {+ return trim(input[0]);+ }+ }++ /**+ * Gets the request parameters for this component as strings.+ *+ * @return The values in the request for this component+ */+ public String[] getInputAsArray()+ {+ List<StringValue> list = getRequest().getRequestParameters().getParameterValues(+ getInputName());++ String[] values = null;+ if (list != null)+ {+ values = new String[list.size()];+ for (int i = 0; i < list.size(); ++i)+ {+ values[i] = list.get(i).toString();+ }+ }++ if (!isInputNullable())+ {+ if (values != null && values.length == 1 && values[0] == null)+ {+ // we the key got passed in (otherwise values would be null),+ // but the value was set to null.+ // As the servlet spec isn't clear on what to do with 'empty'+ // request values - most return an empty string, but some null -+ // we have to workaround here and deliberately set to an empty+ // string if the the component is not nullable (text components)+ return EMPTY_STRING_ARRAY;+ }+ }+ return values;+ }++ /**+ * Gets the string to be used for the <tt>name</tt> attribute of the form element. Generated+ * using the path from the form to the component, excluding the form itself. Override it if you+ * want even a smaller name. E.g. if you know for sure that the id is unique within a form.+ *+ * @return The string to use as the form element's name attribute+ */+ public String getInputName()+ {+ String inputName = Form.getRootFormRelativeId(this);+ Form<?> form = findParent(Form.class);++ if (form != null)+ {+ return form.getInputNamePrefix() + inputName;+ }+ else+ {+ return inputName;+ }+ }++ /**+ * Use hasRawInput() to check if this component has raw input because null can mean 2 things: It+ * doesn't have rawinput or the rawinput is really null.+ *+ * @return The raw form input that is stored for this formcomponent+ */+ public final String getRawInput()+ {+ return NO_RAW_INPUT.equals(rawInput) ? null : rawInput;+ }++ /**+ * @return the type to use when updating the model for this form component+ */+ @SuppressWarnings("unchecked")+ public final Class<T> getType()+ {+ return typeName == null ? null : (Class<T>)WicketObjects.resolveClass(typeName);+ }++ /**+ * @see Form#getValidatorKeyPrefix()+ * @return prefix used when constructing validator key messages+ */+ public String getValidatorKeyPrefix()+ {+ Form<?> form = findParent(Form.class);+ if (form != null)+ {+ return getForm().getValidatorKeyPrefix();+ }+ return null;+ }++ /**+ * Gets an unmodifiable list of validators for this FormComponent.+ *+ * @return List of validators+ */+ @SuppressWarnings("unchecked")+ public final List<IValidator<? super T>> getValidators()+ {+ final List<IValidator<? super T>> list = new ArrayList<>();++ for (Behavior behavior : getBehaviors())+ {+ if (behavior instanceof IValidator)+ {+ list.add((IValidator<? super T>)behavior);+ }+ }++ return Collections.unmodifiableList(list);+ }++ /**+ * Gets current value for a form component, which can be either input data entered by the user,+ * or the component's model object if no input was provided.+ *+ * @return The value+ */+ public final String getValue()+ {+ if (NO_RAW_INPUT.equals(rawInput))+ {+ return getModelValue();+ }+ else+ {+ if (getEscapeModelStrings() && rawInput != null)+ {+ return Strings.escapeMarkup(rawInput).toString();+ }+ return rawInput;+ }+ }++ /**+ * Returns whether this component has raw input. Raw input is unconverted input straight from+ * the client.+ *+ * @return boolean whether this component has raw input.+ */+ public final boolean hasRawInput()+ {+ return !NO_RAW_INPUT.equals(rawInput);+ }++ /**+ * Used by Form to tell the FormComponent that a new user input is available+ */+ public final void inputChanged()+ {+ if (isVisibleInHierarchy() && isEnabledInHierarchy())+ {+ // Get input as String array+ final String[] input = getInputAsArray();++ // If there is any input+ if (input != null && input.length > 0 && input[0] != null)+ {+ // join the values together with ";", for example, "id1;id2;id3"+ rawInput = StringList.valueOf(input).join(VALUE_SEPARATOR);+ }+ else if (isInputNullable())+ {+ // no input+ rawInput = null;+ }+ else+ {+ rawInput = NO_RAW_INPUT;+ }+ }+ }++ /**+ * Indicate that validation of this form component failed.+ */+ public final void invalid()+ {+ onInvalid();+ }++ /**+ * Gets whether this component's input can be null. By default, components that do not get input+ * will have null values passed in for input. However, component TextField is an example+ * (possibly the only one) that never gets a null passed in, even if the field is left empty+ * UNLESS it had attribute <code>disabled="disabled"</code> set.+ *+ * @return True if this component's input can be null. Returns true by default.+ */+ public boolean isInputNullable()+ {+ return true;+ }++ /**+ * @return True if this component encodes data in a multipart form submit+ */+ public boolean isMultiPart()+ {+ return false;+ }++ /**+ * @return whether or not this component's value is required+ */+ public boolean isRequired()+ {+ return getFlag(FLAG_REQUIRED);+ }++ /**+ * Gets whether this component is 'valid'. Valid in this context means that no validation errors+ * were reported the last time the form component was processed. This variable not only is+ * convenient for 'business' use, but is also necessary as we don't want the form component+ * models updated with invalid input.+ *+ * @return valid whether this component is 'valid'+ */+ public final boolean isValid()+ {+ class IsValidVisitor implements IVisitor<FormComponent<?>, Boolean>+ {+ @Override+ public void component(final FormComponent<?> formComponent, final IVisit<Boolean> visit)+ {+ if (formComponent.hasErrorMessage())+ {+ visit.stop(Boolean.FALSE);+ }+ }+ }+ IsValidVisitor tmp = new IsValidVisitor();+ final Object result = visitFormComponentsPostOrder(this, tmp);+ return (Boolean.FALSE != result);+ }++ /**+ * @see IFormVisitorParticipant#processChildren()+ */+ @Override+ public boolean processChildren()+ {+ return true;+ }++ /**+ * This method will retrieve the request parameter, validate it, and if valid update the model.+ * These are the same steps as would be performed by the form.+ *+ * This is useful when a formcomponent is used outside a form.+ *+ */+ public final void processInput()+ {+ inputChanged();+ validate();+ if (hasErrorMessage())+ {+ invalid();+ }+ else+ {+ valid();+ updateModel();+ }+ }++ /**+ * The value will be made available to the validator property by means of ${label}. It does not+ * have any specific meaning to FormComponent itself.+ *+ * @param labelModel+ * @return this for chaining+ */+ @Override+ public FormComponent<T> setLabel(IModel<String> labelModel)+ {+ super.setLabel(labelModel);+ return this;+ }++ /**+ * Sets the value for a form component.+ *+ * @param value+ * The value+ */+ public void setModelValue(final String[] value)+ {+ convertedInput = convertValue(value);+ updateModel();+ }++ /**+ * Sets the required flag+ *+ * @param required+ * @return this for chaining+ */+ public final FormComponent<T> setRequired(final boolean required)+ {+ if (!required && getType() != null && getType().isPrimitive())+ {+ throw new WicketRuntimeException(+ "FormComponent can't be required when the type is primitive class: " + this);+ }+ if (required != isRequired())+ {+ addStateChange();+ }+ setFlag(FLAG_REQUIRED, required);+ return this;+ }++ /**+ * Sets the type that will be used when updating the model for this component. If no type is+ * specified String type is assumed.+ *+ * @param type+ * @return this for chaining+ */+ public FormComponent<T> setType(Class<?> type)+ {+ typeName = type == null ? null : type.getName();+ if (type != null && type.isPrimitive())+ {+ setRequired(true);+ }+ return this;+ }++ /**+ * Updates this components model from the request, it expects that the object is already+ * converted through the convertInput() call that is called by the validate() method when a form+ * is being processed.+ *+ * By default it just does this:+ *+ * <pre>+ * setModelObject(getConvertedInput());+ * </pre>+ *+ * <strong>DO NOT CALL THIS METHOD DIRECTLY UNLESS YOU ARE SURE WHAT YOU ARE DOING. USUALLY UPDATING+ * YOUR MODEL IS HANDLED BY THE FORM, NOT DIRECTLY BY YOU.</strong>+ */+ @Override+ public void updateModel()+ {+ setModelObject(getConvertedInput());+ }+++ /**+ * Called to indicate that the user input is valid.+ */+ public final void valid()+ {+ clearInput();++ onValid();+ }++ /**+ * Performs full validation of the form component, which consists of calling validateRequired(),+ * convertInput(), and validateValidators(). This method should only be used if the form+ * component needs to be fully validated outside the form process.+ */+ public void validate()+ {+ // clear any previous feedback messages++ if (hasFeedbackMessage())+ {+ getFeedbackMessages().clear();+ }++ // validate++ validateRequired();+ if (isValid())+ {+ convertInput();+ if (isValid())+ {+ if (isRequired() && getConvertedInput() == null && isInputNullable())+ {+ reportRequiredError();+ }+ else+ {+ validateValidators();+ }+ }+ }+ }++ /**+ * Converts and validates the conversion of the raw input string into the object specified by+ * {@link FormComponent#getType()} and records any thrown {@link ConversionException}s.+ * Converted value is available through {@link FormComponent#getConvertedInput()}.+ *+ * <p>+ * Usually the user should do custom conversions by specifying an {@link IConverter} by+ * registering it with the application by overriding {@link Application#getConverterLocator()},+ * or at the component level by overriding {@link #getConverter(Class)} .+ * </p>+ *+ * <strong>DO NOT CALL THIS METHOD DIRECTLY UNLESS YOU ARE SURE WHAT YOU ARE DOING. USUALLY UPDATING+ * YOUR MODEL IS HANDLED BY THE FORM, NOT DIRECTLY BY YOU.</strong>+ *+ * @see IConverterLocator+ * @see Application#newConverterLocator()+ * @see IConverter#convertToObject(String, Locale)+ * @see #newValidationError(ConversionException)+ */+ public void convertInput()+ {+ if (typeName == null)+ {+ try+ {+ convertedInput = convertValue(getInputAsArray());+ }+ catch (ConversionException e)+ {+ error(newValidationError(e));+ }+ }+ else+ {+ final IConverter<T> converter = getConverter(getType());++ try+ {+ convertedInput = converter.convertToObject(getInput(), getLocale());+ }+ catch (ConversionException e)+ {+ error(newValidationError(e));+ }+ }+ }++ /**+ * This method is called, when the validation triggered by {@link FormComponent#convertInput()}+ * failed with a {@link ConversionException}, to construct a {@link ValidationError} based on+ * the exception.+ * <p>+ * Override this method to modify the ValidationError object, e.g. add a custom variable for+ * message substitution:+ * <p>+ *+ * <pre>+ * new FormComponent<T>(id)+ * {+ * protected ValidationError newValidationError(ConversionException cause)+ * {+ * return super.newValidationError(cause).setVariable("foo", foovalue);+ * }+ * };+ * </pre>+ *+ * @param cause+ * the original cause+ * @return {@link ValidationError}+ */+ protected ValidationError newValidationError(ConversionException cause)+ {+ ValidationError error = new ValidationError(cause.getMessage());++ if (cause.getResourceKey() != null)+ {+ error.addKey(cause.getResourceKey());+ }++ if (typeName == null)+ {+ if (cause.getTargetType() != null)+ {+ error.addKey("ConversionError." + Classes.simpleName(cause.getTargetType()));+ }+ error.addKey("ConversionError");+ }+ else+ {+ String simpleName = Classes.simpleName(getType());+ error.addKey("IConverter." + simpleName);+ error.addKey("IConverter");+ error.setVariable("type", simpleName);+ }++ final Locale locale = cause.getLocale();+ if (locale != null)+ {+ error.setVariable("locale", locale);+ }++ error.setVariable("exception", cause);++ Format format = cause.getFormat();+ if (format instanceof SimpleDateFormat)+ {+ error.setVariable("format", ((SimpleDateFormat)format).toLocalizedPattern());+ }++ Map<String, Object> variables = cause.getVariables();+ if (variables != null)+ {+ error.getVariables().putAll(variables);+ }++ return error;+ }++ /**+ * Subclasses should overwrite this if the conversion is not done through the type field and the+ * {@link IConverter}. <strong>WARNING: this method may be removed in future versions.</strong>+ *+ * If conversion fails then a ConversionException should be thrown+ *+ * @param value+ * The value can be the getInput() or through a cookie+ *+ * @return The converted value. default returns just the given value+ * @throws ConversionException+ * If input can't be converted+ */+ @SuppressWarnings("unchecked")+ protected T convertValue(String[] value) throws ConversionException+ {+ return (T)(value != null && value.length > 0 && value[0] != null ? trim(value[0]) : null);+ }++ /**+ * @return Value to return when model value is needed+ */+ protected String getModelValue()+ {+ return getDefaultModelObjectAsString();+ }++ /**+ * Gets the request parameter for this component as an int.+ *+ * @return The value in the request for this component+ */+ protected final int inputAsInt()+ {+ final String string = getInput();+ try+ {+ return Integer.parseInt(string);+ }+ catch (NumberFormatException e)+ {+ throw new IllegalArgumentException(+ exceptionMessage("Internal error. Request string '" + string ++ "' not a valid integer"));+ }+ }++ /**+ * Gets the request parameter for this component as an int, using the given default in case no+ * corresponding request parameter was found.+ *+ * @param defaultValue+ * Default value to return if request does not have an integer for this component+ * @return The value in the request for this component+ */+ protected final int inputAsInt(final int defaultValue)+ {+ final String string = getInput();+ if (string != null)+ {+ try+ {+ return Integer.parseInt(string);+ }+ catch (NumberFormatException e)+ {+ throw new IllegalArgumentException(exceptionMessage("Request string '" + string ++ "' is not a valid integer"));+ }+ }+ else+ {+ return defaultValue;+ }+ }++ /**+ * Gets the request parameters for this component as ints.+ *+ * @return The values in the request for this component+ */+ protected final int[] inputAsIntArray()+ {+ final String[] strings = getInputAsArray();+ if (strings != null)+ {+ final int[] ints = new int[strings.length];+ for (int i = 0; i < strings.length; i++)+ {+ ints[i] = Integer.parseInt(strings[i]);+ }+ return ints;+ }+ return null;+ }++ /**+ * @see org.apache.wicket.Component#internalOnModelChanged()+ */+ @Override+ protected void internalOnModelChanged()+ {+ // If the model for this form component changed, we should make it+ // valid again because there can't be any invalid input for it anymore.+ valid();+ }++ /**+ * Processes the component tag.+ *+ * @param tag+ * Tag to modify+ * @see org.apache.wicket.Component#onComponentTag(ComponentTag)+ */+ @Override+ protected void onComponentTag(final ComponentTag tag)+ {+ tag.put("name", getInputName());++ if (!isEnabledInHierarchy())+ {+ onDisabled(tag);+ }++ if (isRequired())+ {+ onRequired(tag);+ }++ super.onComponentTag(tag);+ }++ /**+ * Sets the temporary converted input value to null.+ *+ * @see org.apache.wicket.Component#onDetach()+ */+ @Override+ protected void onDetach()+ {+ super.onDetach();+// convertedInput = null;+ }++ /**+ * Called by {@link #onComponentTag(ComponentTag)} when the component is disabled. By default,+ * this method will add a disabled="disabled" attribute to the tag. Components may override this+ * method to tweak the tag as they think is fit.+ *+ * @param tag+ * the tag that is being rendered+ */+ protected void onDisabled(final ComponentTag tag)+ {+ tag.put("disabled", "disabled");+ }++ /**+ * Called by {@link #onComponentTag(ComponentTag)} when the component is required.+ *+ * @param tag+ * the tag that is being rendered+ */+ @Deprecated+ protected void onRequired(final ComponentTag tag)+ {+ }++ /**+ * Handle invalidation+ */+ protected void onInvalid()+ {+ }++ /**+ * Handle validation+ */+ protected void onValid()+ {+ }++ /**+ * Determines whether or not this component should trim its input prior to processing it. The+ * default value is <code>true</code>+ *+ * @return True if the input should be trimmed.+ */+ protected boolean shouldTrimInput()+ {+ return true;+ }++ /**+ * Trims the input according to {@link #shouldTrimInput()}+ *+ * @param string+ * @return trimmed input if {@link #shouldTrimInput()} returns true, unchanged input otherwise+ */+ protected String trim(String string)+ {+ String trimmed = string;+ if (trimmed != null && shouldTrimInput())+ {+ trimmed = trimmed.trim();+ }+ return trimmed;+ }++ /**+ * Checks if the raw input value is not null if this component is required.+ */+ protected final void validateRequired()+ {+ if (!checkRequired())+ {+ reportRequiredError();+ }+ }++ /**+ * Reports required error against this component+ */+ protected void reportRequiredError()+ {+ error(new ValidationError().addKey("Required"));+ }++ /**+ * Validates this component using the component's validators.+ */+ @SuppressWarnings("unchecked")+ protected final void validateValidators()+ {+ final IValidatable<T> validatable = newValidatable();++ boolean isNull = getConvertedInput() == null;++ IValidator<T> validator;++ for (Behavior behavior : getBehaviors())+ {+ if (isBehaviorAccepted(behavior) == false)+ {+ continue;+ }++ validator = null;+ if (behavior instanceof ValidatorAdapter)+ {+ validator = ((ValidatorAdapter<T>)behavior).getValidator();+ }+ else if (behavior instanceof IValidator)+ {+ validator = (IValidator<T>)behavior;+ }+ if (validator != null)+ {+ if (isNull == false || validator instanceof INullAcceptingValidator<?>)+ {+ try+ {+ validator.validate(validatable);+ }+ catch (Exception e)+ {+ throw new WicketRuntimeException("Exception '" + e.getMessage() ++ "' occurred during validation " + validator.getClass().getName() ++ " on component " + getPath(), e);+ }+ }+ if (!isValid())+ {+ break;+ }+ }+ }+ }++ /**+ * Creates an IValidatable that can be used to validate this form component. This validatable+ * incorporates error key lookups that correspond to this form component.+ *+ * This method is useful when validation needs to happen outside the regular validation workflow+ * but error messages should still be properly reported against the form component.+ *+ * @return IValidatable<T> for this form component+ */+ public final IValidatable<T> newValidatable()+ {+ return new ValidatableAdapter();+ }++ @Override+ @SuppressWarnings("unchecked")+ public final IModel<T> getModel()+ {+ return (IModel<T>)getDefaultModel();+ }++ @Override+ public final void setModel(IModel<T> model)+ {+ setDefaultModel(model);+ }++ @SuppressWarnings("unchecked")+ @Override+ public final T getModelObject()+ {+ return (T)getDefaultModelObject();+ }++ @Override+ public final void setModelObject(T object)+ {+ setDefaultModelObject(object);+ }++ /**+ * Updates auto label css classes such as error/required during ajax updates when the labels may+ * not be directly repainted in the response.+ *+ * @param target+ */+ public final void updateAutoLabels(AjaxRequestTarget target)+ {+ AutoLabelMarker marker = getMetaData(AutoLabelResolver.MARKER_KEY);++ if (marker == null)+ {+ // this component does not have an auto label+ return;+ }++ marker.updateFrom(this, target);+ }++ /**+ * Update the model of a {@link FormComponent} containing a {@link Collection}.+ *+ * If the model object does not yet exists, a new {@link ArrayList} is filled with the converted+ * input and used as the new model object. Otherwise the existing collection is modified+ * in-place, then {@link Model#setObject(Object)} is called with the same instance: it allows+ * the Model to be notified of changes even when {@link Model#getObject()} returns a different+ * {@link Collection} at every invocation.+ *+ * @param <S>+ * collection type+ * @param formComponent+ * the form component to update+ * @see FormComponent#updateModel()+ * @throws WicketRuntimeException+ * if the existing model object collection is unmodifiable and no setter exists+ */+ public static <S> void updateCollectionModel(FormComponent<Collection<S>> formComponent)+ {+ Collection<S> convertedInput = formComponent.getConvertedInput();+ if (convertedInput == null) {+ convertedInput = Collections.emptyList();+ }++ Collection<S> collection = formComponent.getModelObject();+ if (collection == null)+ {+ collection = new ArrayList<>(convertedInput);+ formComponent.setModelObject(collection);+ }+ else+ {+ boolean modified = false;++ formComponent.modelChanging();++ try+ {+ collection.clear();+ collection.addAll(convertedInput);+ modified = true;+ }+ catch (UnsupportedOperationException unmodifiable)+ {+ if (logger.isDebugEnabled())+ {+ logger.debug("An error occurred while trying to modify the collection attached to "+ + formComponent, unmodifiable);+ }+ collection = new ArrayList<>(convertedInput);+ }++ try+ {+ formComponent.getModel().setObject(collection);+ }+ catch (Exception noSetter)+ {+ if (!modified)+ {+ throw new WicketRuntimeException("An error occurred while trying to set the collection attached to "+ + formComponent, noSetter);+ }+ else if (logger.isDebugEnabled())+ {+ logger.debug("An error occurred while trying to set the collection attached to "+ + formComponent, noSetter);+ }+ }++ formComponent.modelChanged();+ }+ }+}