diff --git a/Dockerfile b/Dockerfile index 39eca3a..e7da3ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV IAM_AUTHORIZE_URL 'https://iam-test.indigo-datacloud.eu/authorize' ENV IAM_CLIENT_ID '53b937c5-fd53-4626-9400-8b21838d7de2' ENV IAM_CLIENT_SECRET 'fcqrPQYZtR-CETMdvxrNoQAKtDw-Qy8hb0ItHd4cX6IJpi6f7124YDYV8SAuL99KfkWMQchQalBP2fJAlhRB7Q' ENV CMDB_URL 'http://indigo.cloud.plgrid.pl' -ENV ONEDATA_URL 'https://onedata.indigo-datacloud.eu' +ENV ONEDATA_URL 'https://onedata.org' ENV MYSQL_ADDRESS 'mysql' ENV MYSQL_PORT '3306' ENV MYSQL_DB 'indigo_slam' diff --git a/pom.xml b/pom.xml index 9a8a403..b49b347 100644 --- a/pom.xml +++ b/pom.xml @@ -56,16 +56,6 @@ - - - - - - - - - - com.agreemount engine @@ -80,11 +70,6 @@ mysql mysql-connector-java - - - com.mashape.unirest unirest-java @@ -147,8 +132,6 @@ org.springframework.hateoas spring-hateoas - org.springframework.security.oauth spring-security-oauth2 @@ -165,13 +148,6 @@ commons-codec 1.10 - - - - - - - @@ -266,23 +242,11 @@ - - scm:git:ssh://git@git.plgrid.pl:7999/fiddev/duo-demo.git - https://git.plgrid.pl/projects/fiddev - scm:git:ssh://git@git.plgrid.pl:7999/fiddev/duo-demo.git - HEAD - - spring-releases https://repo.spring.io/libs-release - - - - - agreemount-cyfro-releases default @@ -297,15 +261,4 @@ https://repo.spring.io/libs-release - - - - fiddev-releases - https://gforge.cyfronet.pl/nexus/content/repositories/fiddev-releases - - - fiddev-snapshots - https://gforge.cyfronet.pl/nexus/content/repositories/fiddev-snapshots - - diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/component/DocumentService.java b/src/main/java/pl/cyfronet/bazaar/engine/extension/component/DocumentService.java deleted file mode 100644 index 170bf9e..0000000 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/component/DocumentService.java +++ /dev/null @@ -1,33 +0,0 @@ -package pl.cyfronet.bazaar.engine.extension.component; - -import lombok.Getter; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Scope; -import org.springframework.context.annotation.ScopedProxyMode; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; -import pl.cyfronet.bazaar.engine.extension.bean.SpringContext; -import pl.cyfronet.ltos.controller.bazaar.BazaarConfig; -import pl.cyfronet.ltos.repository.DocumentWeightRepository; - - -@Service(value = "documentservice") -public class DocumentService { - @Autowired - DocumentWeightRepository documentWeightRepository; - - @Value("${cmdb.url}") - @Getter - private String cmdbUrl; - - @Getter - @Autowired - SitesService sitesService; - - public DocumentService() { - - } -} diff --git a/src/main/java/pl/cyfronet/indigo/Application.java b/src/main/java/pl/cyfronet/indigo/Application.java new file mode 100644 index 0000000..d9eda54 --- /dev/null +++ b/src/main/java/pl/cyfronet/indigo/Application.java @@ -0,0 +1,35 @@ +package pl.cyfronet.indigo; + +import com.agreemount.slaneg.fixtures.FileRulesProvidersConfiguration; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.*; + +/** + * @author bwilk + * + */ +@SpringBootApplication +@EnableAutoConfiguration +@PropertySources({ + @PropertySource("classpath:bootstrap.properties"), + @PropertySource("classpath:hibernate.properties"), + @PropertySource("classpath:auth.properties"), + @PropertySource("classpath:bazaar.properties"), + @PropertySource("classpath:mongo.properties") + }) +@ComponentScan( + basePackages = {"com.agreemount","pl.cyfronet.indigo"}, + excludeFilters = { + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, + value = FileRulesProvidersConfiguration.class) + } +) +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} \ No newline at end of file diff --git a/src/main/java/pl/cyfronet/ltos/bean/Affiliation.java b/src/main/java/pl/cyfronet/indigo/bean/Affiliation.java similarity index 93% rename from src/main/java/pl/cyfronet/ltos/bean/Affiliation.java rename to src/main/java/pl/cyfronet/indigo/bean/Affiliation.java index 63824a7..11b8852 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/Affiliation.java +++ b/src/main/java/pl/cyfronet/indigo/bean/Affiliation.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean; +package pl.cyfronet.indigo.bean; import java.util.Date; @@ -14,8 +14,6 @@ import lombok.Data; import lombok.ToString; -import com.fasterxml.jackson.annotation.JsonIgnore; - /** * @author bwilk * diff --git a/src/main/java/pl/cyfronet/ltos/bean/DocumentWeight.java b/src/main/java/pl/cyfronet/indigo/bean/DocumentWeight.java similarity index 77% rename from src/main/java/pl/cyfronet/ltos/bean/DocumentWeight.java rename to src/main/java/pl/cyfronet/indigo/bean/DocumentWeight.java index 0fff69d..4412b78 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/DocumentWeight.java +++ b/src/main/java/pl/cyfronet/indigo/bean/DocumentWeight.java @@ -1,11 +1,9 @@ -package pl.cyfronet.ltos.bean; +package pl.cyfronet.indigo.bean; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import javax.persistence.*; -import javax.validation.constraints.NotNull; -import java.util.List; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/bean/DocumentWeightPk.java b/src/main/java/pl/cyfronet/indigo/bean/DocumentWeightPk.java similarity index 78% rename from src/main/java/pl/cyfronet/ltos/bean/DocumentWeightPk.java rename to src/main/java/pl/cyfronet/indigo/bean/DocumentWeightPk.java index d4e53d1..c46ecd8 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/DocumentWeightPk.java +++ b/src/main/java/pl/cyfronet/indigo/bean/DocumentWeightPk.java @@ -1,7 +1,5 @@ -package pl.cyfronet.ltos.bean; +package pl.cyfronet.indigo.bean; -import javax.persistence.Embeddable; -import javax.persistence.IdClass; import java.io.Serializable; /** diff --git a/src/main/java/pl/cyfronet/ltos/bean/Role.java b/src/main/java/pl/cyfronet/indigo/bean/Role.java similarity index 87% rename from src/main/java/pl/cyfronet/ltos/bean/Role.java rename to src/main/java/pl/cyfronet/indigo/bean/Role.java index 24b9b5f..e0bf831 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/Role.java +++ b/src/main/java/pl/cyfronet/indigo/bean/Role.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean; +package pl.cyfronet.indigo.bean; import java.util.List; @@ -9,8 +9,6 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; -import com.fasterxml.jackson.annotation.JsonIgnore; - import lombok.Data; /** diff --git a/src/main/java/pl/cyfronet/ltos/bean/SLAData.java b/src/main/java/pl/cyfronet/indigo/bean/SLAData.java similarity index 86% rename from src/main/java/pl/cyfronet/ltos/bean/SLAData.java rename to src/main/java/pl/cyfronet/indigo/bean/SLAData.java index f097ee0..266b183 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/SLAData.java +++ b/src/main/java/pl/cyfronet/indigo/bean/SLAData.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean; +package pl.cyfronet.indigo.bean; /** * Created by chomik on 27.01.16. diff --git a/src/main/java/pl/cyfronet/ltos/bean/Team.java b/src/main/java/pl/cyfronet/indigo/bean/Team.java similarity index 94% rename from src/main/java/pl/cyfronet/ltos/bean/Team.java rename to src/main/java/pl/cyfronet/indigo/bean/Team.java index a1e2b10..7c5d139 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/Team.java +++ b/src/main/java/pl/cyfronet/indigo/bean/Team.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean; +package pl.cyfronet.indigo.bean; import java.util.List; diff --git a/src/main/java/pl/cyfronet/ltos/bean/User.java b/src/main/java/pl/cyfronet/indigo/bean/User.java similarity index 97% rename from src/main/java/pl/cyfronet/ltos/bean/User.java rename to src/main/java/pl/cyfronet/indigo/bean/User.java index 95ecfcd..ea17b33 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/User.java +++ b/src/main/java/pl/cyfronet/indigo/bean/User.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean; +package pl.cyfronet.indigo.bean; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; diff --git a/src/main/java/pl/cyfronet/ltos/bean/legacy/CreateGrantData.java b/src/main/java/pl/cyfronet/indigo/bean/legacy/CreateGrantData.java similarity index 88% rename from src/main/java/pl/cyfronet/ltos/bean/legacy/CreateGrantData.java rename to src/main/java/pl/cyfronet/indigo/bean/legacy/CreateGrantData.java index a7d2ea7..eca2b11 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/legacy/CreateGrantData.java +++ b/src/main/java/pl/cyfronet/indigo/bean/legacy/CreateGrantData.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean.legacy; +package pl.cyfronet.indigo.bean.legacy; /** * Created by chomik on 27.01.16. diff --git a/src/main/java/pl/cyfronet/ltos/bean/legacy/GenericBean.java b/src/main/java/pl/cyfronet/indigo/bean/legacy/GenericBean.java similarity index 93% rename from src/main/java/pl/cyfronet/ltos/bean/legacy/GenericBean.java rename to src/main/java/pl/cyfronet/indigo/bean/legacy/GenericBean.java index c8b5475..5bcb7df 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/legacy/GenericBean.java +++ b/src/main/java/pl/cyfronet/indigo/bean/legacy/GenericBean.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean.legacy; +package pl.cyfronet.indigo.bean.legacy; /** * Created by lpalonek on 04.12.14. diff --git a/src/main/java/pl/cyfronet/ltos/bean/legacy/Status.java b/src/main/java/pl/cyfronet/indigo/bean/legacy/Status.java similarity index 71% rename from src/main/java/pl/cyfronet/ltos/bean/legacy/Status.java rename to src/main/java/pl/cyfronet/indigo/bean/legacy/Status.java index 0b2a3d8..708ce05 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/legacy/Status.java +++ b/src/main/java/pl/cyfronet/indigo/bean/legacy/Status.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean.legacy; +package pl.cyfronet.indigo.bean.legacy; /** * Created by lpalonek on 04.12.14. diff --git a/src/main/java/pl/cyfronet/ltos/bean/legacy/UserFirstSteps.java b/src/main/java/pl/cyfronet/indigo/bean/legacy/UserFirstSteps.java similarity index 85% rename from src/main/java/pl/cyfronet/ltos/bean/legacy/UserFirstSteps.java rename to src/main/java/pl/cyfronet/indigo/bean/legacy/UserFirstSteps.java index f48a13f..ce24ec6 100644 --- a/src/main/java/pl/cyfronet/ltos/bean/legacy/UserFirstSteps.java +++ b/src/main/java/pl/cyfronet/indigo/bean/legacy/UserFirstSteps.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.bean.legacy; +package pl.cyfronet.indigo.bean.legacy; import lombok.Data; diff --git a/src/main/java/pl/cyfronet/indigo/controller/CmdbController.java b/src/main/java/pl/cyfronet/indigo/controller/CmdbController.java new file mode 100755 index 0000000..a6756c0 --- /dev/null +++ b/src/main/java/pl/cyfronet/indigo/controller/CmdbController.java @@ -0,0 +1,28 @@ +package pl.cyfronet.indigo.controller; + +import com.mashape.unirest.http.Unirest; +import com.mashape.unirest.http.exceptions.UnirestException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + + +@Controller +public class CmdbController { + + static Logger logger = LoggerFactory + .getLogger(CmdbController.class); + + @Value("${cmdb.url}") + private String cmdbUrl; + + @RequestMapping(value = "api/sites", method = RequestMethod.GET) + @ResponseBody + public String getSites() throws UnirestException { + return Unirest.get(cmdbUrl+"/cmdb/service/list").asString().getBody(); + } +} diff --git a/src/main/java/pl/cyfronet/ltos/rest/controller/EngineExtensionController.java b/src/main/java/pl/cyfronet/indigo/controller/EngineExtensionController.java similarity index 80% rename from src/main/java/pl/cyfronet/ltos/rest/controller/EngineExtensionController.java rename to src/main/java/pl/cyfronet/indigo/controller/EngineExtensionController.java index cbe2f62..3b2eb85 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/controller/EngineExtensionController.java +++ b/src/main/java/pl/cyfronet/indigo/controller/EngineExtensionController.java @@ -1,14 +1,14 @@ -package pl.cyfronet.ltos.rest.controller; +package pl.cyfronet.indigo.controller; import lombok.extern.log4j.Log4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import pl.cyfronet.ltos.bean.DocumentWeight; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.repository.DocumentWeightRepository; -import pl.cyfronet.ltos.repository.UserRepository; -import pl.cyfronet.ltos.security.PortalUser; +import pl.cyfronet.indigo.bean.DocumentWeight; +import pl.cyfronet.indigo.bean.User; +import pl.cyfronet.indigo.repository.DocumentWeightRepository; +import pl.cyfronet.indigo.repository.UserRepository; +import pl.cyfronet.indigo.security.PortalUser; import java.util.List; diff --git a/src/main/java/pl/cyfronet/ltos/controller/IndexController.java b/src/main/java/pl/cyfronet/indigo/controller/IndexController.java similarity index 63% rename from src/main/java/pl/cyfronet/ltos/controller/IndexController.java rename to src/main/java/pl/cyfronet/indigo/controller/IndexController.java index da519d9..59ba5ae 100644 --- a/src/main/java/pl/cyfronet/ltos/controller/IndexController.java +++ b/src/main/java/pl/cyfronet/indigo/controller/IndexController.java @@ -1,11 +1,14 @@ -package pl.cyfronet.ltos.controller; +package pl.cyfronet.indigo.controller; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; -import pl.cyfronet.ltos.security.PortalUser; +import org.springframework.web.servlet.view.RedirectView; +import pl.cyfronet.indigo.security.PortalUser; +import javax.servlet.http.HttpSession; import java.util.ArrayList; @Controller @@ -30,4 +33,13 @@ public ModelAndView home(PortalUser user) { mav.getModelMap().addAttribute("version", version); return mav; } + + @RequestMapping(value = "/auth/logout", method = RequestMethod.GET) + public RedirectView logout(HttpSession session) { + session.invalidate(); + RedirectView redirectView = new RedirectView(); + redirectView.setContextRelative(true); + redirectView.setUrl("/"); + return redirectView; + } } diff --git a/src/main/java/pl/cyfronet/ltos/rest/controller/RestController.java b/src/main/java/pl/cyfronet/indigo/controller/RestController.java similarity index 87% rename from src/main/java/pl/cyfronet/ltos/rest/controller/RestController.java rename to src/main/java/pl/cyfronet/indigo/controller/RestController.java index fa442aa..f8b262c 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/controller/RestController.java +++ b/src/main/java/pl/cyfronet/indigo/controller/RestController.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.rest.controller; +package pl.cyfronet.indigo.controller; import lombok.extern.log4j.Log4j; import org.springframework.beans.factory.annotation.Autowired; @@ -6,10 +6,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import pl.cyfronet.ltos.repository.UserRepository; -import pl.cyfronet.ltos.rest.bean.IndigoWrapper; -import pl.cyfronet.ltos.rest.bean.sla.Sla; -import pl.cyfronet.ltos.rest.logic.IndigoRestLogic; +import pl.cyfronet.indigo.repository.UserRepository; +import pl.cyfronet.indigo.rest.bean.IndigoWrapper; +import pl.cyfronet.indigo.rest.bean.sla.Sla; +import pl.cyfronet.indigo.rest.logic.IndigoRestLogic; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/action/definition/SetOrganizationAsTeam.java b/src/main/java/pl/cyfronet/indigo/engine/extension/action/definition/SetOrganizationAsTeam.java similarity index 78% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/action/definition/SetOrganizationAsTeam.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/action/definition/SetOrganizationAsTeam.java index af1423d..efcfc3d 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/action/definition/SetOrganizationAsTeam.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/action/definition/SetOrganizationAsTeam.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.action.definition; +package pl.cyfronet.indigo.engine.extension.action.definition; import com.agreemount.slaneg.action.definition.Action; import com.agreemount.slaneg.annotation.HandleWithImplementation; @@ -6,7 +6,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -import pl.cyfronet.bazaar.engine.extension.action.impl.SetOrganizationAsTeamImpl; +import pl.cyfronet.indigo.engine.extension.action.impl.SetOrganizationAsTeamImpl; @Getter @Setter diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/action/impl/SetOrganizationAsTeamImpl.java b/src/main/java/pl/cyfronet/indigo/engine/extension/action/impl/SetOrganizationAsTeamImpl.java similarity index 91% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/action/impl/SetOrganizationAsTeamImpl.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/action/impl/SetOrganizationAsTeamImpl.java index de663e0..c53c980 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/action/impl/SetOrganizationAsTeamImpl.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/action/impl/SetOrganizationAsTeamImpl.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.action.impl; +package pl.cyfronet.indigo.engine.extension.action.impl; import com.agreemount.bean.document.Document; import com.agreemount.bean.identity.provider.IdentityProvider; @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import pl.cyfronet.bazaar.engine.extension.action.definition.SetOrganizationAsTeam; +import pl.cyfronet.indigo.engine.extension.action.definition.SetOrganizationAsTeam; @Component @Scope("prototype") diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/bean/IndigoDocument.java b/src/main/java/pl/cyfronet/indigo/engine/extension/bean/IndigoDocument.java similarity index 88% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/bean/IndigoDocument.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/bean/IndigoDocument.java index adcd04b..03e77b3 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/bean/IndigoDocument.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/bean/IndigoDocument.java @@ -1,12 +1,12 @@ -package pl.cyfronet.bazaar.engine.extension.bean; +package pl.cyfronet.indigo.engine.extension.bean; import com.agreemount.bean.document.Document; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.security.core.context.SecurityContextHolder; -import pl.cyfronet.ltos.bean.DocumentWeight; -import pl.cyfronet.ltos.bean.DocumentWeightPk; -import pl.cyfronet.ltos.security.PortalUser; +import pl.cyfronet.indigo.bean.DocumentWeight; +import pl.cyfronet.indigo.bean.DocumentWeightPk; +import pl.cyfronet.indigo.security.PortalUser; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/bean/Site.java b/src/main/java/pl/cyfronet/indigo/engine/extension/bean/Site.java similarity index 77% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/bean/Site.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/bean/Site.java index 4c136ce..04c939e 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/bean/Site.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/bean/Site.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.bean; +package pl.cyfronet.indigo.engine.extension.bean; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/bean/SpringContext.java b/src/main/java/pl/cyfronet/indigo/engine/extension/bean/SpringContext.java similarity index 81% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/bean/SpringContext.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/bean/SpringContext.java index 3ad088d..36d4236 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/bean/SpringContext.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/bean/SpringContext.java @@ -1,13 +1,11 @@ -package pl.cyfronet.bazaar.engine.extension.bean; +package pl.cyfronet.indigo.engine.extension.bean; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import pl.cyfronet.bazaar.engine.extension.component.DocumentService; -import pl.cyfronet.ltos.repository.DocumentWeightRepository; +import pl.cyfronet.indigo.engine.extension.component.DocumentService; +import pl.cyfronet.indigo.repository.DocumentWeightRepository; /** * Created by mszostak on 27.04.17. diff --git a/src/main/java/pl/cyfronet/indigo/engine/extension/component/DocumentService.java b/src/main/java/pl/cyfronet/indigo/engine/extension/component/DocumentService.java new file mode 100644 index 0000000..a77cca7 --- /dev/null +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/component/DocumentService.java @@ -0,0 +1,26 @@ +package pl.cyfronet.indigo.engine.extension.component; + +import lombok.Getter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import pl.cyfronet.indigo.repository.DocumentWeightRepository; + + +@Service(value = "documentservice") +public class DocumentService { + @Autowired + DocumentWeightRepository documentWeightRepository; + + @Value("${cmdb.url}") + @Getter + private String cmdbUrl; + + @Getter + @Autowired + SitesService sitesService; + + public DocumentService() { + + } +} diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/component/IndigoDocumentFactory.java b/src/main/java/pl/cyfronet/indigo/engine/extension/component/IndigoDocumentFactory.java similarity index 64% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/component/IndigoDocumentFactory.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/component/IndigoDocumentFactory.java index a7c95b0..c124937 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/component/IndigoDocumentFactory.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/component/IndigoDocumentFactory.java @@ -1,11 +1,8 @@ -package pl.cyfronet.bazaar.engine.extension.component; +package pl.cyfronet.indigo.engine.extension.component; import com.agreemount.slaneg.action.DocumentFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import pl.cyfronet.bazaar.engine.extension.bean.IndigoDocument; +import pl.cyfronet.indigo.engine.extension.bean.IndigoDocument; /** * Created by mszostak on 12.04.17. diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/component/SitesService.java b/src/main/java/pl/cyfronet/indigo/engine/extension/component/SitesService.java similarity index 90% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/component/SitesService.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/component/SitesService.java index 30d0e52..e37ac28 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/component/SitesService.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/component/SitesService.java @@ -1,6 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.component; - -import java.util.HashMap; +package pl.cyfronet.indigo.engine.extension.component; import org.json.JSONArray; import org.json.JSONObject; @@ -8,9 +6,10 @@ import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.stereotype.Component; +import pl.cyfronet.indigo.engine.extension.bean.Site; +import pl.cyfronet.indigo.repository.CmdbRepository; -import pl.cyfronet.bazaar.engine.extension.bean.Site; -import pl.cyfronet.ltos.repository.CmdbRepository; +import java.util.HashMap; /** * Created by mszostak on 06.04.17. diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/IndigoQueryConstraintsFactory.java b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/IndigoQueryConstraintsFactory.java similarity index 92% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/IndigoQueryConstraintsFactory.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/constraint/IndigoQueryConstraintsFactory.java index 8d7dc99..9206ccb 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/IndigoQueryConstraintsFactory.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/IndigoQueryConstraintsFactory.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.constraint; +package pl.cyfronet.indigo.engine.extension.constraint; import com.agreemount.bean.identity.provider.IdentityProvider; import com.agreemount.slaneg.action.ActionContext; @@ -9,7 +9,7 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import pl.cyfronet.bazaar.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite; +import pl.cyfronet.indigo.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite; @Component public class IndigoQueryConstraintsFactory implements CustomQueryConstraintsFactory { diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/definition/HasAnyOfMetrics.java b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/definition/HasAnyOfMetrics.java similarity index 82% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/definition/HasAnyOfMetrics.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/definition/HasAnyOfMetrics.java index eb55c18..e98fdec 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/definition/HasAnyOfMetrics.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/definition/HasAnyOfMetrics.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.constraint.action.definition; +package pl.cyfronet.indigo.engine.extension.constraint.action.definition; import com.agreemount.slaneg.annotation.HandleWithImplementation; import com.agreemount.slaneg.constraint.action.definition.ActionConstraint; @@ -6,7 +6,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -import pl.cyfronet.bazaar.engine.extension.constraint.action.impl.HasAnyOfMetricsImpl; +import pl.cyfronet.indigo.engine.extension.constraint.action.impl.HasAnyOfMetricsImpl; import java.util.List; diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/definition/IsPublicService.java b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/definition/IsPublicService.java similarity index 80% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/definition/IsPublicService.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/definition/IsPublicService.java index df4eb7d..9a05eb2 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/definition/IsPublicService.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/definition/IsPublicService.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.constraint.action.definition; +package pl.cyfronet.indigo.engine.extension.constraint.action.definition; import com.agreemount.slaneg.annotation.HandleWithImplementation; import com.agreemount.slaneg.constraint.action.definition.ActionConstraint; @@ -6,7 +6,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -import pl.cyfronet.bazaar.engine.extension.constraint.action.impl.IsPublicServiceImpl; +import pl.cyfronet.indigo.engine.extension.constraint.action.impl.IsPublicServiceImpl; @Getter @Setter diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/impl/HasAnyOfMetricsImpl.java b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/impl/HasAnyOfMetricsImpl.java similarity index 91% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/impl/HasAnyOfMetricsImpl.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/impl/HasAnyOfMetricsImpl.java index 9349f2b..634ac64 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/impl/HasAnyOfMetricsImpl.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/impl/HasAnyOfMetricsImpl.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.constraint.action.impl; +package pl.cyfronet.indigo.engine.extension.constraint.action.impl; import com.agreemount.bean.document.Document; import com.agreemount.slaneg.action.ActionContext; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import pl.cyfronet.bazaar.engine.extension.constraint.action.definition.HasAnyOfMetrics; +import pl.cyfronet.indigo.engine.extension.constraint.action.definition.HasAnyOfMetrics; import java.util.List; diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/impl/IsPublicServiceImpl.java b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/impl/IsPublicServiceImpl.java similarity index 90% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/impl/IsPublicServiceImpl.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/impl/IsPublicServiceImpl.java index 2c8cb3a..1c79d8b 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/action/impl/IsPublicServiceImpl.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/action/impl/IsPublicServiceImpl.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.constraint.action.impl; +package pl.cyfronet.indigo.engine.extension.constraint.action.impl; import com.agreemount.bean.document.Document; import com.agreemount.slaneg.action.ActionContext; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import pl.cyfronet.bazaar.engine.extension.constraint.action.definition.IsPublicService; -import pl.cyfronet.ltos.repository.CmdbRepository; +import pl.cyfronet.indigo.engine.extension.constraint.action.definition.IsPublicService; +import pl.cyfronet.indigo.repository.CmdbRepository; @Component @Scope("prototype") diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/query/definition/IsAdministratorInRelatedSite.java b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/query/definition/IsAdministratorInRelatedSite.java similarity index 85% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/query/definition/IsAdministratorInRelatedSite.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/constraint/query/definition/IsAdministratorInRelatedSite.java index 553af3e..df48279 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/constraint/query/definition/IsAdministratorInRelatedSite.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/constraint/query/definition/IsAdministratorInRelatedSite.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.extension.constraint.query.definition; +package pl.cyfronet.indigo.engine.extension.constraint.query.definition; import com.agreemount.slaneg.constraint.query.definition.QueryConstraint; import lombok.EqualsAndHashCode; diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/metric/SiteSelectMetric.java b/src/main/java/pl/cyfronet/indigo/engine/extension/metric/SiteSelectMetric.java similarity index 94% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/metric/SiteSelectMetric.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/metric/SiteSelectMetric.java index 37bbb13..92c41f5 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/metric/SiteSelectMetric.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/metric/SiteSelectMetric.java @@ -1,18 +1,16 @@ -package pl.cyfronet.bazaar.engine.extension.metric; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package pl.cyfronet.indigo.engine.extension.metric; +import com.agreemount.bean.metric.Metric; +import com.agreemount.bean.metric.MetricOption; import org.json.JSONArray; import org.json.JSONObject; import org.springframework.context.annotation.PropertySource; +import pl.cyfronet.indigo.repository.CmdbRepository; -import com.agreemount.bean.metric.Metric; -import com.agreemount.bean.metric.MetricOption; - -import pl.cyfronet.ltos.repository.CmdbRepository; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @lombok.Getter @lombok.Setter diff --git a/src/main/java/pl/cyfronet/bazaar/engine/extension/metric/SpaceMetric.java b/src/main/java/pl/cyfronet/indigo/engine/extension/metric/SpaceMetric.java similarity index 84% rename from src/main/java/pl/cyfronet/bazaar/engine/extension/metric/SpaceMetric.java rename to src/main/java/pl/cyfronet/indigo/engine/extension/metric/SpaceMetric.java index 5e609e4..b9aff77 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/extension/metric/SpaceMetric.java +++ b/src/main/java/pl/cyfronet/indigo/engine/extension/metric/SpaceMetric.java @@ -1,16 +1,15 @@ -package pl.cyfronet.bazaar.engine.extension.metric; +package pl.cyfronet.indigo.engine.extension.metric; + +import com.agreemount.bean.metric.Metric; +import com.agreemount.bean.metric.MetricOption; +import pl.cyfronet.indigo.repository.OneDataRepository; +import pl.cyfronet.indigo.repository.onedata.Space; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.agreemount.bean.metric.Metric; -import com.agreemount.bean.metric.MetricOption; - -import pl.cyfronet.ltos.repository.OneDataRepository; -import pl.cyfronet.ltos.repository.onedata.Space; - public class SpaceMetric extends Metric { public static OneDataRepository oneDataClient; diff --git a/src/main/java/pl/cyfronet/bazaar/engine/rules/GenericYamlProvider.java b/src/main/java/pl/cyfronet/indigo/engine/rules/GenericYamlProvider.java similarity index 97% rename from src/main/java/pl/cyfronet/bazaar/engine/rules/GenericYamlProvider.java rename to src/main/java/pl/cyfronet/indigo/engine/rules/GenericYamlProvider.java index 390ef66..efbf87a 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/rules/GenericYamlProvider.java +++ b/src/main/java/pl/cyfronet/indigo/engine/rules/GenericYamlProvider.java @@ -1,4 +1,4 @@ -package pl.cyfronet.bazaar.engine.rules; +package pl.cyfronet.indigo.engine.rules; import com.agreemount.slaneg.fixtures.RulesProvider; import com.esotericsoftware.yamlbeans.YamlReader; diff --git a/src/main/java/pl/cyfronet/bazaar/engine/rules/YamlProvidersConfiguration.java b/src/main/java/pl/cyfronet/indigo/engine/rules/YamlProvidersConfiguration.java similarity index 87% rename from src/main/java/pl/cyfronet/bazaar/engine/rules/YamlProvidersConfiguration.java rename to src/main/java/pl/cyfronet/indigo/engine/rules/YamlProvidersConfiguration.java index 1c09e09..1ed9368 100644 --- a/src/main/java/pl/cyfronet/bazaar/engine/rules/YamlProvidersConfiguration.java +++ b/src/main/java/pl/cyfronet/indigo/engine/rules/YamlProvidersConfiguration.java @@ -1,10 +1,12 @@ -package pl.cyfronet.bazaar.engine.rules; +package pl.cyfronet.indigo.engine.rules; import com.agreemount.bean.Query; import com.agreemount.bean.document.state.State; import com.agreemount.bean.metric.Metric; import com.agreemount.bean.metric.MetricCategory; import com.agreemount.bean.query.QueryCategory; +import com.agreemount.slaneg.action.ActionContext; +import com.agreemount.slaneg.action.ActionContextFactory; import com.agreemount.slaneg.action.definition.Action; import com.agreemount.slaneg.constraint.action.definition.ActionConstraint; import com.agreemount.slaneg.message.Message; @@ -60,4 +62,9 @@ public GenericYamlProvider constraintGenericYamlProvider() { public GenericYamlProvider messageGenericYamlProvider() { return new GenericYamlProvider<>("messages"); } + + @Bean + public ActionContextFactory getActionContextFactory() { + return new ActionContextFactory<>(ActionContext.class); + } } \ No newline at end of file diff --git a/src/main/java/pl/cyfronet/ltos/jpa/config/Config.java b/src/main/java/pl/cyfronet/indigo/jpa/config/Config.java similarity index 74% rename from src/main/java/pl/cyfronet/ltos/jpa/config/Config.java rename to src/main/java/pl/cyfronet/indigo/jpa/config/Config.java index 1ef1785..2a756d9 100644 --- a/src/main/java/pl/cyfronet/ltos/jpa/config/Config.java +++ b/src/main/java/pl/cyfronet/indigo/jpa/config/Config.java @@ -1,8 +1,8 @@ -package pl.cyfronet.ltos.jpa.config; +package pl.cyfronet.indigo.jpa.config; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import pl.cyfronet.ltos.repository.RepositoryConfig; +import pl.cyfronet.indigo.repository.RepositoryConfig; /** * Created by km on 10.06.16. diff --git a/src/main/java/pl/cyfronet/ltos/jpa/config/DataSourceConfig.java b/src/main/java/pl/cyfronet/indigo/jpa/config/DataSourceConfig.java similarity index 97% rename from src/main/java/pl/cyfronet/ltos/jpa/config/DataSourceConfig.java rename to src/main/java/pl/cyfronet/indigo/jpa/config/DataSourceConfig.java index a4cc4ba..c074fb6 100644 --- a/src/main/java/pl/cyfronet/ltos/jpa/config/DataSourceConfig.java +++ b/src/main/java/pl/cyfronet/indigo/jpa/config/DataSourceConfig.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.jpa.config; +package pl.cyfronet.indigo.jpa.config; import javax.sql.DataSource; diff --git a/src/main/java/pl/cyfronet/ltos/jpa/config/JpaConfig.java b/src/main/java/pl/cyfronet/indigo/jpa/config/JpaConfig.java similarity index 97% rename from src/main/java/pl/cyfronet/ltos/jpa/config/JpaConfig.java rename to src/main/java/pl/cyfronet/indigo/jpa/config/JpaConfig.java index 3e54846..76e6c22 100644 --- a/src/main/java/pl/cyfronet/ltos/jpa/config/JpaConfig.java +++ b/src/main/java/pl/cyfronet/indigo/jpa/config/JpaConfig.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.jpa.config; +package pl.cyfronet.indigo.jpa.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/pl/cyfronet/ltos/repository/AffiliationRepository.java b/src/main/java/pl/cyfronet/indigo/repository/AffiliationRepository.java similarity index 92% rename from src/main/java/pl/cyfronet/ltos/repository/AffiliationRepository.java rename to src/main/java/pl/cyfronet/indigo/repository/AffiliationRepository.java index 0b793b6..c2434f1 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/AffiliationRepository.java +++ b/src/main/java/pl/cyfronet/indigo/repository/AffiliationRepository.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.repository; +package pl.cyfronet.indigo.repository; import org.springframework.data.repository.CrudRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; @@ -6,7 +6,7 @@ import org.springframework.security.access.prepost.PostFilter; import org.springframework.security.access.prepost.PreAuthorize; -import pl.cyfronet.ltos.bean.Affiliation; +import pl.cyfronet.indigo.bean.Affiliation; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/repository/CmdbRepository.java b/src/main/java/pl/cyfronet/indigo/repository/CmdbRepository.java similarity index 91% rename from src/main/java/pl/cyfronet/ltos/repository/CmdbRepository.java rename to src/main/java/pl/cyfronet/indigo/repository/CmdbRepository.java index 8e1489e..f5df4f0 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/CmdbRepository.java +++ b/src/main/java/pl/cyfronet/indigo/repository/CmdbRepository.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.repository; +package pl.cyfronet.indigo.repository; import lombok.extern.log4j.Log4j; import org.json.JSONObject; @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.oauth2.client.OAuth2RestOperations; import org.springframework.stereotype.Component; -import pl.cyfronet.bazaar.engine.extension.constraint.action.impl.IsPublicServiceImpl; -import pl.cyfronet.bazaar.engine.extension.metric.SiteSelectMetric; +import pl.cyfronet.indigo.engine.extension.constraint.action.impl.IsPublicServiceImpl; +import pl.cyfronet.indigo.engine.extension.metric.SiteSelectMetric; import javax.annotation.PostConstruct; import java.util.Map; diff --git a/src/main/java/pl/cyfronet/ltos/repository/DocumentWeightRepository.java b/src/main/java/pl/cyfronet/indigo/repository/DocumentWeightRepository.java similarity index 60% rename from src/main/java/pl/cyfronet/ltos/repository/DocumentWeightRepository.java rename to src/main/java/pl/cyfronet/indigo/repository/DocumentWeightRepository.java index fec29b1..f5d8e42 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/DocumentWeightRepository.java +++ b/src/main/java/pl/cyfronet/indigo/repository/DocumentWeightRepository.java @@ -1,8 +1,8 @@ -package pl.cyfronet.ltos.repository; +package pl.cyfronet.indigo.repository; import org.springframework.data.repository.CrudRepository; -import pl.cyfronet.ltos.bean.DocumentWeight; -import pl.cyfronet.ltos.bean.DocumentWeightPk; +import pl.cyfronet.indigo.bean.DocumentWeight; +import pl.cyfronet.indigo.bean.DocumentWeightPk; /** * Created by mszostak on 12.04.17. diff --git a/src/main/java/pl/cyfronet/ltos/repository/OneDataRepository.java b/src/main/java/pl/cyfronet/indigo/repository/OneDataRepository.java similarity index 95% rename from src/main/java/pl/cyfronet/ltos/repository/OneDataRepository.java rename to src/main/java/pl/cyfronet/indigo/repository/OneDataRepository.java index 7b37cdd..b6bba68 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/OneDataRepository.java +++ b/src/main/java/pl/cyfronet/indigo/repository/OneDataRepository.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.repository; +package pl.cyfronet.indigo.repository; import java.security.KeyManagementException; import java.security.KeyStoreException; @@ -27,8 +27,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import pl.cyfronet.bazaar.engine.extension.metric.SpaceMetric; -import pl.cyfronet.ltos.repository.onedata.Space; +import pl.cyfronet.indigo.engine.extension.metric.SpaceMetric; +import pl.cyfronet.indigo.repository.onedata.Space; @Component public class OneDataRepository { diff --git a/src/main/java/pl/cyfronet/ltos/repository/RepositoryConfig.java b/src/main/java/pl/cyfronet/indigo/repository/RepositoryConfig.java similarity index 87% rename from src/main/java/pl/cyfronet/ltos/repository/RepositoryConfig.java rename to src/main/java/pl/cyfronet/indigo/repository/RepositoryConfig.java index 8262d76..321f153 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/RepositoryConfig.java +++ b/src/main/java/pl/cyfronet/indigo/repository/RepositoryConfig.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.repository; +package pl.cyfronet.indigo.repository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -6,8 +6,8 @@ import org.springframework.data.rest.core.event.ValidatingRepositoryEventListener; import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapter; -import pl.cyfronet.ltos.repository.validation.AffiliationValidator; -import pl.cyfronet.ltos.repository.validation.UserValidator; +import pl.cyfronet.indigo.repository.validation.AffiliationValidator; +import pl.cyfronet.indigo.repository.validation.UserValidator; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/repository/RoleRepository.java b/src/main/java/pl/cyfronet/indigo/repository/RoleRepository.java similarity index 85% rename from src/main/java/pl/cyfronet/ltos/repository/RoleRepository.java rename to src/main/java/pl/cyfronet/indigo/repository/RoleRepository.java index f8d53c7..e723357 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/RoleRepository.java +++ b/src/main/java/pl/cyfronet/indigo/repository/RoleRepository.java @@ -1,9 +1,9 @@ -package pl.cyfronet.ltos.repository; +package pl.cyfronet.indigo.repository; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.springframework.data.rest.core.annotation.RepositoryRestResource; -import pl.cyfronet.ltos.bean.Role; +import pl.cyfronet.indigo.bean.Role; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/repository/TeamRepository.java b/src/main/java/pl/cyfronet/indigo/repository/TeamRepository.java similarity index 77% rename from src/main/java/pl/cyfronet/ltos/repository/TeamRepository.java rename to src/main/java/pl/cyfronet/indigo/repository/TeamRepository.java index 79ea2a6..2f7b150 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/TeamRepository.java +++ b/src/main/java/pl/cyfronet/indigo/repository/TeamRepository.java @@ -1,9 +1,9 @@ -package pl.cyfronet.ltos.repository; +package pl.cyfronet.indigo.repository; import org.springframework.data.repository.CrudRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; -import pl.cyfronet.ltos.bean.Team; +import pl.cyfronet.indigo.bean.Team; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/repository/UserRepository.java b/src/main/java/pl/cyfronet/indigo/repository/UserRepository.java similarity index 92% rename from src/main/java/pl/cyfronet/ltos/repository/UserRepository.java rename to src/main/java/pl/cyfronet/indigo/repository/UserRepository.java index 6e1b843..cdcfcf4 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/UserRepository.java +++ b/src/main/java/pl/cyfronet/indigo/repository/UserRepository.java @@ -1,9 +1,9 @@ -package pl.cyfronet.ltos.repository; +package pl.cyfronet.indigo.repository; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.springframework.data.rest.core.annotation.RepositoryRestResource; -import pl.cyfronet.ltos.bean.User; +import pl.cyfronet.indigo.bean.User; import java.util.List; /** diff --git a/src/main/java/pl/cyfronet/ltos/repository/handler/AffiliationEventHandler.java b/src/main/java/pl/cyfronet/indigo/repository/handler/AffiliationEventHandler.java similarity index 88% rename from src/main/java/pl/cyfronet/ltos/repository/handler/AffiliationEventHandler.java rename to src/main/java/pl/cyfronet/indigo/repository/handler/AffiliationEventHandler.java index c49d6bd..04ef940 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/handler/AffiliationEventHandler.java +++ b/src/main/java/pl/cyfronet/indigo/repository/handler/AffiliationEventHandler.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.repository.handler; +package pl.cyfronet.indigo.repository.handler; import java.util.Date; @@ -6,7 +6,7 @@ import org.springframework.data.rest.core.annotation.HandleBeforeSave; import org.springframework.data.rest.core.annotation.RepositoryEventHandler; -import pl.cyfronet.ltos.bean.Affiliation; +import pl.cyfronet.indigo.bean.Affiliation; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/repository/handler/HandlersConfig.java b/src/main/java/pl/cyfronet/indigo/repository/handler/HandlersConfig.java similarity index 89% rename from src/main/java/pl/cyfronet/ltos/repository/handler/HandlersConfig.java rename to src/main/java/pl/cyfronet/indigo/repository/handler/HandlersConfig.java index 5097129..622d093 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/handler/HandlersConfig.java +++ b/src/main/java/pl/cyfronet/indigo/repository/handler/HandlersConfig.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.repository.handler; +package pl.cyfronet.indigo.repository.handler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/pl/cyfronet/ltos/repository/handler/UserEventHandler.java b/src/main/java/pl/cyfronet/indigo/repository/handler/UserEventHandler.java similarity index 85% rename from src/main/java/pl/cyfronet/ltos/repository/handler/UserEventHandler.java rename to src/main/java/pl/cyfronet/indigo/repository/handler/UserEventHandler.java index 0def7d1..ca54185 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/handler/UserEventHandler.java +++ b/src/main/java/pl/cyfronet/indigo/repository/handler/UserEventHandler.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.repository.handler; +package pl.cyfronet.indigo.repository.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,9 +6,9 @@ import org.springframework.data.rest.core.annotation.HandleBeforeCreate; import org.springframework.data.rest.core.annotation.HandleBeforeSave; import org.springframework.data.rest.core.annotation.RepositoryEventHandler; -import pl.cyfronet.ltos.bean.Role; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.repository.RoleRepository; +import pl.cyfronet.indigo.bean.Role; +import pl.cyfronet.indigo.bean.User; +import pl.cyfronet.indigo.repository.RoleRepository; import java.util.Arrays; diff --git a/src/main/java/pl/cyfronet/ltos/repository/onedata/Space.java b/src/main/java/pl/cyfronet/indigo/repository/onedata/Space.java similarity index 86% rename from src/main/java/pl/cyfronet/ltos/repository/onedata/Space.java rename to src/main/java/pl/cyfronet/indigo/repository/onedata/Space.java index f84174b..9376e96 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/onedata/Space.java +++ b/src/main/java/pl/cyfronet/indigo/repository/onedata/Space.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.repository.onedata; +package pl.cyfronet.indigo.repository.onedata; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/pl/cyfronet/ltos/repository/validation/AffiliationValidator.java b/src/main/java/pl/cyfronet/indigo/repository/validation/AffiliationValidator.java similarity index 91% rename from src/main/java/pl/cyfronet/ltos/repository/validation/AffiliationValidator.java rename to src/main/java/pl/cyfronet/indigo/repository/validation/AffiliationValidator.java index 4f0d1e1..856acac 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/validation/AffiliationValidator.java +++ b/src/main/java/pl/cyfronet/indigo/repository/validation/AffiliationValidator.java @@ -1,10 +1,10 @@ -package pl.cyfronet.ltos.repository.validation; +package pl.cyfronet.indigo.repository.validation; import org.springframework.validation.Errors; import org.springframework.validation.ValidationUtils; import org.springframework.validation.Validator; -import pl.cyfronet.ltos.bean.Affiliation; +import pl.cyfronet.indigo.bean.Affiliation; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/repository/validation/UserValidator.java b/src/main/java/pl/cyfronet/indigo/repository/validation/UserValidator.java similarity index 88% rename from src/main/java/pl/cyfronet/ltos/repository/validation/UserValidator.java rename to src/main/java/pl/cyfronet/indigo/repository/validation/UserValidator.java index 14948de..1f3ef66 100644 --- a/src/main/java/pl/cyfronet/ltos/repository/validation/UserValidator.java +++ b/src/main/java/pl/cyfronet/indigo/repository/validation/UserValidator.java @@ -1,10 +1,10 @@ -package pl.cyfronet.ltos.repository.validation; +package pl.cyfronet.indigo.repository.validation; import org.springframework.validation.Errors; import org.springframework.validation.ValidationUtils; import org.springframework.validation.Validator; -import pl.cyfronet.ltos.bean.User; +import pl.cyfronet.indigo.bean.User; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/IndigoWrapper.java b/src/main/java/pl/cyfronet/indigo/rest/bean/IndigoWrapper.java similarity index 63% rename from src/main/java/pl/cyfronet/ltos/rest/bean/IndigoWrapper.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/IndigoWrapper.java index db64419..bf4583e 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/IndigoWrapper.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/IndigoWrapper.java @@ -1,8 +1,8 @@ -package pl.cyfronet.ltos.rest.bean; +package pl.cyfronet.indigo.rest.bean; import lombok.*; -import pl.cyfronet.ltos.rest.bean.preferences.Preferences; -import pl.cyfronet.ltos.rest.bean.sla.Sla; +import pl.cyfronet.indigo.rest.bean.preferences.Preferences; +import pl.cyfronet.indigo.rest.bean.sla.Sla; import java.util.List; diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Preference.java b/src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Preference.java similarity index 82% rename from src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Preference.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Preference.java index 2c0f16b..669cf9d 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Preference.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Preference.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.rest.bean.preferences; +package pl.cyfronet.indigo.rest.bean.preferences; import lombok.*; diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Preferences.java b/src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Preferences.java similarity index 84% rename from src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Preferences.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Preferences.java index 3c103b5..02c2cae 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Preferences.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Preferences.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.rest.bean.preferences; +package pl.cyfronet.indigo.rest.bean.preferences; import lombok.*; diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Priority.java b/src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Priority.java similarity index 82% rename from src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Priority.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Priority.java index 39f9ce6..b437716 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/preferences/Priority.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/preferences/Priority.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.rest.bean.preferences; +package pl.cyfronet.indigo.rest.bean.preferences; import lombok.*; diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/Document.java b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/Document.java similarity index 77% rename from src/main/java/pl/cyfronet/ltos/rest/bean/sla/Document.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/sla/Document.java index a08af62..1e54d06 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/Document.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/Document.java @@ -1,13 +1,8 @@ -package pl.cyfronet.ltos.rest.bean.sla; +package pl.cyfronet.indigo.rest.bean.sla; import lombok.*; import java.util.HashMap; -import java.util.Map; - -import lombok.*; - -import java.util.Map; /** * Created by km on 11.07.16. diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/DocumentAction.java b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/DocumentAction.java similarity index 66% rename from src/main/java/pl/cyfronet/ltos/rest/bean/sla/DocumentAction.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/sla/DocumentAction.java index 26ed0e2..e544ddb 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/DocumentAction.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/DocumentAction.java @@ -1,13 +1,7 @@ -package pl.cyfronet.ltos.rest.bean.sla; +package pl.cyfronet.indigo.rest.bean.sla; import lombok.*; -import java.util.Map; - -import lombok.*; - -import java.util.Map; - /** * Created by km on 11.07.16. */ diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/Service.java b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/Service.java similarity index 86% rename from src/main/java/pl/cyfronet/ltos/rest/bean/sla/Service.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/sla/Service.java index 1b50915..2d015b0 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/Service.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/Service.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.rest.bean.sla; +package pl.cyfronet.indigo.rest.bean.sla; import lombok.*; diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/Sla.java b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/Sla.java similarity index 89% rename from src/main/java/pl/cyfronet/ltos/rest/bean/sla/Sla.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/sla/Sla.java index cd9e13d..b35dce7 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/Sla.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/Sla.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.rest.bean.sla; +package pl.cyfronet.indigo.rest.bean.sla; import lombok.*; diff --git a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/Target.java b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/Target.java similarity index 85% rename from src/main/java/pl/cyfronet/ltos/rest/bean/sla/Target.java rename to src/main/java/pl/cyfronet/indigo/rest/bean/sla/Target.java index 532d25c..dd8deb9 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/bean/sla/Target.java +++ b/src/main/java/pl/cyfronet/indigo/rest/bean/sla/Target.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.rest.bean.sla; +package pl.cyfronet.indigo.rest.bean.sla; import lombok.*; diff --git a/src/main/java/pl/cyfronet/ltos/rest/logic/IndigoRestLogic.java b/src/main/java/pl/cyfronet/indigo/rest/logic/IndigoRestLogic.java similarity index 90% rename from src/main/java/pl/cyfronet/ltos/rest/logic/IndigoRestLogic.java rename to src/main/java/pl/cyfronet/indigo/rest/logic/IndigoRestLogic.java index bd97690..1927398 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/logic/IndigoRestLogic.java +++ b/src/main/java/pl/cyfronet/indigo/rest/logic/IndigoRestLogic.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.rest.logic; +package pl.cyfronet.indigo.rest.logic; import org.springframework.data.mongodb.core.query.Query; import com.agreemount.bean.document.Document; @@ -11,10 +11,10 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.client.HttpClientErrorException; -import pl.cyfronet.ltos.repository.UserRepository; -import pl.cyfronet.ltos.rest.bean.IndigoWrapper; -import pl.cyfronet.ltos.rest.bean.sla.Sla; -import pl.cyfronet.ltos.rest.util.IndigoConverter; +import pl.cyfronet.indigo.repository.UserRepository; +import pl.cyfronet.indigo.rest.bean.IndigoWrapper; +import pl.cyfronet.indigo.rest.bean.sla.Sla; +import pl.cyfronet.indigo.rest.util.IndigoConverter; import java.util.List; diff --git a/src/main/java/pl/cyfronet/ltos/rest/util/IndigoConverter.java b/src/main/java/pl/cyfronet/indigo/rest/util/IndigoConverter.java similarity index 88% rename from src/main/java/pl/cyfronet/ltos/rest/util/IndigoConverter.java rename to src/main/java/pl/cyfronet/indigo/rest/util/IndigoConverter.java index 0ac2821..ac691f9 100644 --- a/src/main/java/pl/cyfronet/ltos/rest/util/IndigoConverter.java +++ b/src/main/java/pl/cyfronet/indigo/rest/util/IndigoConverter.java @@ -1,22 +1,20 @@ -package pl.cyfronet.ltos.rest.util; +package pl.cyfronet.indigo.rest.util; import com.agreemount.bean.document.Document; import com.agreemount.bean.metric.Metric; import com.agreemount.engine.facade.MetricFacade; -import com.agreemount.slaneg.db.DocumentOperations; -import com.agreemount.slaneg.db.RelationOperations; import lombok.extern.log4j.Log4j; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import pl.cyfronet.bazaar.engine.extension.bean.IndigoDocument; -import pl.cyfronet.ltos.rest.bean.IndigoWrapper; -import pl.cyfronet.ltos.rest.bean.preferences.Preference; -import pl.cyfronet.ltos.rest.bean.preferences.Preferences; -import pl.cyfronet.ltos.rest.bean.preferences.Priority; -import pl.cyfronet.ltos.rest.bean.sla.Service; -import pl.cyfronet.ltos.rest.bean.sla.Sla; -import pl.cyfronet.ltos.rest.bean.sla.Target; +import pl.cyfronet.indigo.engine.extension.bean.IndigoDocument; +import pl.cyfronet.indigo.rest.bean.IndigoWrapper; +import pl.cyfronet.indigo.rest.bean.preferences.Preference; +import pl.cyfronet.indigo.rest.bean.preferences.Preferences; +import pl.cyfronet.indigo.rest.bean.preferences.Priority; +import pl.cyfronet.indigo.rest.bean.sla.Service; +import pl.cyfronet.indigo.rest.bean.sla.Sla; +import pl.cyfronet.indigo.rest.bean.sla.Target; import java.util.*; @@ -27,12 +25,6 @@ @Component public class IndigoConverter { - @Autowired - private RelationOperations relationOperations; - - @Autowired - private DocumentOperations documentOperations; - @Autowired private MetricFacade metricFacade; diff --git a/src/main/java/pl/cyfronet/ltos/security/AuthenticationProviderDev.java b/src/main/java/pl/cyfronet/indigo/security/AuthenticationProviderDev.java similarity index 97% rename from src/main/java/pl/cyfronet/ltos/security/AuthenticationProviderDev.java rename to src/main/java/pl/cyfronet/indigo/security/AuthenticationProviderDev.java index 88d3915..d46c177 100644 --- a/src/main/java/pl/cyfronet/ltos/security/AuthenticationProviderDev.java +++ b/src/main/java/pl/cyfronet/indigo/security/AuthenticationProviderDev.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import com.agreemount.bean.identity.provider.IdentityProvider; import lombok.extern.slf4j.Slf4j; @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import pl.cyfronet.ltos.bean.Role; -import pl.cyfronet.ltos.bean.Team; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.repository.TeamRepository; +import pl.cyfronet.indigo.bean.Role; +import pl.cyfronet.indigo.bean.Team; +import pl.cyfronet.indigo.bean.User; +import pl.cyfronet.indigo.repository.TeamRepository; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; diff --git a/src/main/java/pl/cyfronet/ltos/security/AuthenticationService.java b/src/main/java/pl/cyfronet/indigo/security/AuthenticationService.java similarity index 92% rename from src/main/java/pl/cyfronet/ltos/security/AuthenticationService.java rename to src/main/java/pl/cyfronet/indigo/security/AuthenticationService.java index 61871a3..63f6413 100644 --- a/src/main/java/pl/cyfronet/ltos/security/AuthenticationService.java +++ b/src/main/java/pl/cyfronet/indigo/security/AuthenticationService.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -6,9 +6,9 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.oauth2.client.OAuth2RestOperations; import org.springframework.stereotype.Service; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.repository.UserRepository; -import pl.cyfronet.ltos.security.AuthenticationProviderDev.UserOperations; +import pl.cyfronet.indigo.bean.User; +import pl.cyfronet.indigo.repository.UserRepository; +import pl.cyfronet.indigo.security.AuthenticationProviderDev.UserOperations; import javax.net.ssl.HttpsURLConnection; import java.util.Arrays; diff --git a/src/main/java/pl/cyfronet/ltos/security/ClientApplication.java b/src/main/java/pl/cyfronet/indigo/security/ClientApplication.java similarity index 98% rename from src/main/java/pl/cyfronet/ltos/security/ClientApplication.java rename to src/main/java/pl/cyfronet/indigo/security/ClientApplication.java index cf0755d..8f0e165 100644 --- a/src/main/java/pl/cyfronet/ltos/security/ClientApplication.java +++ b/src/main/java/pl/cyfronet/indigo/security/ClientApplication.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import java.util.List; diff --git a/src/main/java/pl/cyfronet/ltos/security/CmdbOwnerService.java b/src/main/java/pl/cyfronet/indigo/security/CmdbOwnerService.java similarity index 97% rename from src/main/java/pl/cyfronet/ltos/security/CmdbOwnerService.java rename to src/main/java/pl/cyfronet/indigo/security/CmdbOwnerService.java index 036c420..afeaa30 100644 --- a/src/main/java/pl/cyfronet/ltos/security/CmdbOwnerService.java +++ b/src/main/java/pl/cyfronet/indigo/security/CmdbOwnerService.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import lombok.extern.slf4j.Slf4j; import org.json.JSONArray; @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.client.RestClientException; -import pl.cyfronet.ltos.repository.CmdbRepository; +import pl.cyfronet.indigo.repository.CmdbRepository; import java.util.*; diff --git a/src/main/java/pl/cyfronet/ltos/security/IdentityProviderImpl.java b/src/main/java/pl/cyfronet/indigo/security/IdentityProviderImpl.java similarity index 95% rename from src/main/java/pl/cyfronet/ltos/security/IdentityProviderImpl.java rename to src/main/java/pl/cyfronet/indigo/security/IdentityProviderImpl.java index 2426f8a..5b4a712 100644 --- a/src/main/java/pl/cyfronet/ltos/security/IdentityProviderImpl.java +++ b/src/main/java/pl/cyfronet/indigo/security/IdentityProviderImpl.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import com.agreemount.bean.identity.Identity; import com.agreemount.bean.identity.TeamMember; @@ -9,9 +9,9 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import pl.cyfronet.ltos.bean.Role; -import pl.cyfronet.ltos.bean.Team; -import pl.cyfronet.ltos.bean.User; +import pl.cyfronet.indigo.bean.Role; +import pl.cyfronet.indigo.bean.Team; +import pl.cyfronet.indigo.bean.User; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/pl/cyfronet/ltos/security/MethodSecurityExpressionRoot.java b/src/main/java/pl/cyfronet/indigo/security/MethodSecurityExpressionRoot.java similarity index 97% rename from src/main/java/pl/cyfronet/ltos/security/MethodSecurityExpressionRoot.java rename to src/main/java/pl/cyfronet/indigo/security/MethodSecurityExpressionRoot.java index 8bbefa4..c390670 100644 --- a/src/main/java/pl/cyfronet/ltos/security/MethodSecurityExpressionRoot.java +++ b/src/main/java/pl/cyfronet/indigo/security/MethodSecurityExpressionRoot.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.springframework.security.access.expression.SecurityExpressionRoot; import org.springframework.security.access.expression.method.MethodSecurityExpressionOperations; diff --git a/src/main/java/pl/cyfronet/ltos/security/OpenIDConnectAuthenticationFailureHandler.java b/src/main/java/pl/cyfronet/indigo/security/OpenIDConnectAuthenticationFailureHandler.java similarity index 97% rename from src/main/java/pl/cyfronet/ltos/security/OpenIDConnectAuthenticationFailureHandler.java rename to src/main/java/pl/cyfronet/indigo/security/OpenIDConnectAuthenticationFailureHandler.java index 7f9be0d..957bad8 100644 --- a/src/main/java/pl/cyfronet/ltos/security/OpenIDConnectAuthenticationFailureHandler.java +++ b/src/main/java/pl/cyfronet/indigo/security/OpenIDConnectAuthenticationFailureHandler.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/pl/cyfronet/ltos/security/OpenIDConnectAuthenticationFilter.java b/src/main/java/pl/cyfronet/indigo/security/OpenIDConnectAuthenticationFilter.java similarity index 98% rename from src/main/java/pl/cyfronet/ltos/security/OpenIDConnectAuthenticationFilter.java rename to src/main/java/pl/cyfronet/indigo/security/OpenIDConnectAuthenticationFilter.java index 2e73625..afea3a3 100644 --- a/src/main/java/pl/cyfronet/ltos/security/OpenIDConnectAuthenticationFilter.java +++ b/src/main/java/pl/cyfronet/indigo/security/OpenIDConnectAuthenticationFilter.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/pl/cyfronet/ltos/security/PortalUser.java b/src/main/java/pl/cyfronet/indigo/security/PortalUser.java similarity index 61% rename from src/main/java/pl/cyfronet/ltos/security/PortalUser.java rename to src/main/java/pl/cyfronet/indigo/security/PortalUser.java index c72135e..597262a 100644 --- a/src/main/java/pl/cyfronet/ltos/security/PortalUser.java +++ b/src/main/java/pl/cyfronet/indigo/security/PortalUser.java @@ -1,8 +1,8 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.springframework.security.core.Authentication; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.security.policy.Identity; +import pl.cyfronet.indigo.bean.User; +import pl.cyfronet.indigo.security.policy.Identity; public interface PortalUser extends Authentication, Identity { default User getUserBean() { diff --git a/src/main/java/pl/cyfronet/ltos/security/PortalUserFactory.java b/src/main/java/pl/cyfronet/indigo/security/PortalUserFactory.java similarity index 93% rename from src/main/java/pl/cyfronet/ltos/security/PortalUserFactory.java rename to src/main/java/pl/cyfronet/indigo/security/PortalUserFactory.java index 13b2220..50b518e 100644 --- a/src/main/java/pl/cyfronet/ltos/security/PortalUserFactory.java +++ b/src/main/java/pl/cyfronet/indigo/security/PortalUserFactory.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/src/main/java/pl/cyfronet/ltos/security/PortalUserImpl.java b/src/main/java/pl/cyfronet/indigo/security/PortalUserImpl.java similarity index 97% rename from src/main/java/pl/cyfronet/ltos/security/PortalUserImpl.java rename to src/main/java/pl/cyfronet/indigo/security/PortalUserImpl.java index e7c738b..16327f7 100644 --- a/src/main/java/pl/cyfronet/ltos/security/PortalUserImpl.java +++ b/src/main/java/pl/cyfronet/indigo/security/PortalUserImpl.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import lombok.Builder; import lombok.Getter; @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; -import pl.cyfronet.ltos.bean.User; +import pl.cyfronet.indigo.bean.User; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/pl/cyfronet/ltos/security/RestAuthenticationFilter.java b/src/main/java/pl/cyfronet/indigo/security/RestAuthenticationFilter.java similarity index 98% rename from src/main/java/pl/cyfronet/ltos/security/RestAuthenticationFilter.java rename to src/main/java/pl/cyfronet/indigo/security/RestAuthenticationFilter.java index 08ea7b8..e290643 100644 --- a/src/main/java/pl/cyfronet/ltos/security/RestAuthenticationFilter.java +++ b/src/main/java/pl/cyfronet/indigo/security/RestAuthenticationFilter.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import java.io.IOException; diff --git a/src/main/java/pl/cyfronet/ltos/security/SecurityBeans.java b/src/main/java/pl/cyfronet/indigo/security/SecurityBeans.java similarity index 88% rename from src/main/java/pl/cyfronet/ltos/security/SecurityBeans.java rename to src/main/java/pl/cyfronet/indigo/security/SecurityBeans.java index 55b6570..67007fa 100644 --- a/src/main/java/pl/cyfronet/ltos/security/SecurityBeans.java +++ b/src/main/java/pl/cyfronet/indigo/security/SecurityBeans.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -6,8 +6,8 @@ import org.springframework.security.access.expression.DenyAllPermissionEvaluator; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; -import pl.cyfronet.ltos.security.policy.Activity; -import pl.cyfronet.ltos.security.policy.Permissions; +import pl.cyfronet.indigo.security.policy.Activity; +import pl.cyfronet.indigo.security.policy.Permissions; /** * Created by mszostak on 09.09.16. diff --git a/src/main/java/pl/cyfronet/ltos/security/SecurityConfig.java b/src/main/java/pl/cyfronet/indigo/security/SecurityConfig.java similarity index 99% rename from src/main/java/pl/cyfronet/ltos/security/SecurityConfig.java rename to src/main/java/pl/cyfronet/indigo/security/SecurityConfig.java index df2279e..110453b 100644 --- a/src/main/java/pl/cyfronet/ltos/security/SecurityConfig.java +++ b/src/main/java/pl/cyfronet/indigo/security/SecurityConfig.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/pl/cyfronet/ltos/security/SecurityConfigDev.java b/src/main/java/pl/cyfronet/indigo/security/SecurityConfigDev.java similarity index 98% rename from src/main/java/pl/cyfronet/ltos/security/SecurityConfigDev.java rename to src/main/java/pl/cyfronet/indigo/security/SecurityConfigDev.java index 3180b09..0fce749 100644 --- a/src/main/java/pl/cyfronet/ltos/security/SecurityConfigDev.java +++ b/src/main/java/pl/cyfronet/indigo/security/SecurityConfigDev.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/pl/cyfronet/ltos/security/SecurityExpressionHandler.java b/src/main/java/pl/cyfronet/indigo/security/SecurityExpressionHandler.java similarity index 94% rename from src/main/java/pl/cyfronet/ltos/security/SecurityExpressionHandler.java rename to src/main/java/pl/cyfronet/indigo/security/SecurityExpressionHandler.java index 5c24ba5..deff972 100644 --- a/src/main/java/pl/cyfronet/ltos/security/SecurityExpressionHandler.java +++ b/src/main/java/pl/cyfronet/indigo/security/SecurityExpressionHandler.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import lombok.Setter; @@ -9,7 +9,7 @@ import org.springframework.security.authentication.AuthenticationTrustResolverImpl; import org.springframework.security.core.Authentication; -import pl.cyfronet.ltos.security.policy.Permissions; +import pl.cyfronet.indigo.security.policy.Permissions; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/security/SecurityExpressionRoot.java b/src/main/java/pl/cyfronet/indigo/security/SecurityExpressionRoot.java similarity index 82% rename from src/main/java/pl/cyfronet/ltos/security/SecurityExpressionRoot.java rename to src/main/java/pl/cyfronet/indigo/security/SecurityExpressionRoot.java index f21ed05..508af9e 100644 --- a/src/main/java/pl/cyfronet/ltos/security/SecurityExpressionRoot.java +++ b/src/main/java/pl/cyfronet/indigo/security/SecurityExpressionRoot.java @@ -1,16 +1,16 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; -import pl.cyfronet.ltos.bean.Affiliation; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.security.bean.AffiliationSecurity; -import pl.cyfronet.ltos.security.bean.UserSecurity; -import pl.cyfronet.ltos.security.policy.Activity; -import pl.cyfronet.ltos.security.policy.Identity; -import pl.cyfronet.ltos.security.policy.Permissions; +import pl.cyfronet.indigo.bean.Affiliation; +import pl.cyfronet.indigo.bean.User; +import pl.cyfronet.indigo.security.bean.AffiliationSecurity; +import pl.cyfronet.indigo.security.bean.UserSecurity; +import pl.cyfronet.indigo.security.policy.Activity; +import pl.cyfronet.indigo.security.policy.Identity; +import pl.cyfronet.indigo.security.policy.Permissions; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/security/SslConfig.java b/src/main/java/pl/cyfronet/indigo/security/SslConfig.java similarity index 98% rename from src/main/java/pl/cyfronet/ltos/security/SslConfig.java rename to src/main/java/pl/cyfronet/indigo/security/SslConfig.java index 1520940..c27b702 100644 --- a/src/main/java/pl/cyfronet/ltos/security/SslConfig.java +++ b/src/main/java/pl/cyfronet/indigo/security/SslConfig.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import org.apache.catalina.connector.Connector; import org.apache.coyote.http11.Http11NioProtocol; diff --git a/src/main/java/pl/cyfronet/ltos/security/UserInfo.java b/src/main/java/pl/cyfronet/indigo/security/UserInfo.java similarity index 94% rename from src/main/java/pl/cyfronet/ltos/security/UserInfo.java rename to src/main/java/pl/cyfronet/indigo/security/UserInfo.java index d0cbbff..b2be186 100644 --- a/src/main/java/pl/cyfronet/ltos/security/UserInfo.java +++ b/src/main/java/pl/cyfronet/indigo/security/UserInfo.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security; +package pl.cyfronet.indigo.security; import lombok.AllArgsConstructor; import lombok.Builder; @@ -6,8 +6,8 @@ import lombok.ToString; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; - import pl.cyfronet.ltos.bean.Role; - import pl.cyfronet.ltos.bean.User; + import pl.cyfronet.indigo.bean.Role; + import pl.cyfronet.indigo.bean.User; @Data @Builder diff --git a/src/main/java/pl/cyfronet/ltos/security/bean/AffiliationSecurity.java b/src/main/java/pl/cyfronet/indigo/security/bean/AffiliationSecurity.java similarity index 75% rename from src/main/java/pl/cyfronet/ltos/security/bean/AffiliationSecurity.java rename to src/main/java/pl/cyfronet/indigo/security/bean/AffiliationSecurity.java index aef5d2d..03e7a6b 100644 --- a/src/main/java/pl/cyfronet/ltos/security/bean/AffiliationSecurity.java +++ b/src/main/java/pl/cyfronet/indigo/security/bean/AffiliationSecurity.java @@ -1,9 +1,9 @@ -package pl.cyfronet.ltos.security.bean; +package pl.cyfronet.indigo.security.bean; import lombok.AllArgsConstructor; import lombok.ToString; -import pl.cyfronet.ltos.bean.Affiliation; -import pl.cyfronet.ltos.security.policy.OwnedResource; +import pl.cyfronet.indigo.bean.Affiliation; +import pl.cyfronet.indigo.security.policy.OwnedResource; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/security/bean/UserSecurity.java b/src/main/java/pl/cyfronet/indigo/security/bean/UserSecurity.java similarity index 67% rename from src/main/java/pl/cyfronet/ltos/security/bean/UserSecurity.java rename to src/main/java/pl/cyfronet/indigo/security/bean/UserSecurity.java index 7a71cd8..886fa06 100644 --- a/src/main/java/pl/cyfronet/ltos/security/bean/UserSecurity.java +++ b/src/main/java/pl/cyfronet/indigo/security/bean/UserSecurity.java @@ -1,9 +1,9 @@ -package pl.cyfronet.ltos.security.bean; +package pl.cyfronet.indigo.security.bean; import lombok.AllArgsConstructor; import lombok.ToString; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.security.policy.OwnedResource; +import pl.cyfronet.indigo.bean.User; +import pl.cyfronet.indigo.security.policy.OwnedResource; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/AbstractSecurityPolicy.java b/src/main/java/pl/cyfronet/indigo/security/policy/AbstractSecurityPolicy.java similarity index 96% rename from src/main/java/pl/cyfronet/ltos/security/policy/AbstractSecurityPolicy.java rename to src/main/java/pl/cyfronet/indigo/security/policy/AbstractSecurityPolicy.java index c36900c..5e29226 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/AbstractSecurityPolicy.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/AbstractSecurityPolicy.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; import java.util.Collection; diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/Activity.java b/src/main/java/pl/cyfronet/indigo/security/policy/Activity.java similarity index 86% rename from src/main/java/pl/cyfronet/ltos/security/policy/Activity.java rename to src/main/java/pl/cyfronet/indigo/security/policy/Activity.java index 3067b3a..fb556e1 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/Activity.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/Activity.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/Identity.java b/src/main/java/pl/cyfronet/indigo/security/policy/Identity.java similarity index 88% rename from src/main/java/pl/cyfronet/ltos/security/policy/Identity.java rename to src/main/java/pl/cyfronet/indigo/security/policy/Identity.java index 4aa3b5c..9860a9b 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/Identity.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/Identity.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; import java.util.Collection; diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/OwnedResource.java b/src/main/java/pl/cyfronet/indigo/security/policy/OwnedResource.java similarity index 68% rename from src/main/java/pl/cyfronet/ltos/security/policy/OwnedResource.java rename to src/main/java/pl/cyfronet/indigo/security/policy/OwnedResource.java index 79e21a3..6024b42 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/OwnedResource.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/OwnedResource.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/OwnerBasedSecurityPolicy.java b/src/main/java/pl/cyfronet/indigo/security/policy/OwnerBasedSecurityPolicy.java similarity index 96% rename from src/main/java/pl/cyfronet/ltos/security/policy/OwnerBasedSecurityPolicy.java rename to src/main/java/pl/cyfronet/indigo/security/policy/OwnerBasedSecurityPolicy.java index b6ec3c4..ae3d9fd 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/OwnerBasedSecurityPolicy.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/OwnerBasedSecurityPolicy.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/Permissions.java b/src/main/java/pl/cyfronet/indigo/security/policy/Permissions.java similarity index 96% rename from src/main/java/pl/cyfronet/ltos/security/policy/Permissions.java rename to src/main/java/pl/cyfronet/indigo/security/policy/Permissions.java index 5e836e2..74eed59 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/Permissions.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/Permissions.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; import java.util.Collection; diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/PermissionsConfig.java b/src/main/java/pl/cyfronet/indigo/security/policy/PermissionsConfig.java similarity index 92% rename from src/main/java/pl/cyfronet/ltos/security/policy/PermissionsConfig.java rename to src/main/java/pl/cyfronet/indigo/security/policy/PermissionsConfig.java index 3b8b7dc..20485ad 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/PermissionsConfig.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/PermissionsConfig.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/Role.java b/src/main/java/pl/cyfronet/indigo/security/policy/Role.java similarity index 64% rename from src/main/java/pl/cyfronet/ltos/security/policy/Role.java rename to src/main/java/pl/cyfronet/indigo/security/policy/Role.java index a7822f4..3540c91 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/Role.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/Role.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/RoleBasedSecurityPolicy.java b/src/main/java/pl/cyfronet/indigo/security/policy/RoleBasedSecurityPolicy.java similarity index 95% rename from src/main/java/pl/cyfronet/ltos/security/policy/RoleBasedSecurityPolicy.java rename to src/main/java/pl/cyfronet/indigo/security/policy/RoleBasedSecurityPolicy.java index 385690f..ac766a4 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/RoleBasedSecurityPolicy.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/RoleBasedSecurityPolicy.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; import java.util.Collection; diff --git a/src/main/java/pl/cyfronet/ltos/security/policy/SecurityPolicy.java b/src/main/java/pl/cyfronet/indigo/security/policy/SecurityPolicy.java similarity index 67% rename from src/main/java/pl/cyfronet/ltos/security/policy/SecurityPolicy.java rename to src/main/java/pl/cyfronet/indigo/security/policy/SecurityPolicy.java index 930ccb5..da3d91e 100644 --- a/src/main/java/pl/cyfronet/ltos/security/policy/SecurityPolicy.java +++ b/src/main/java/pl/cyfronet/indigo/security/policy/SecurityPolicy.java @@ -1,4 +1,4 @@ -package pl.cyfronet.ltos.security.policy; +package pl.cyfronet.indigo.security.policy; /** * @author bwilk diff --git a/src/main/java/pl/cyfronet/ltos/Application.java b/src/main/java/pl/cyfronet/ltos/Application.java deleted file mode 100644 index cae8355..0000000 --- a/src/main/java/pl/cyfronet/ltos/Application.java +++ /dev/null @@ -1,39 +0,0 @@ -package pl.cyfronet.ltos; - -import com.agreemount.bean.document.Document; -import com.agreemount.slaneg.action.DocumentFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.annotation.PropertySources; -import pl.cyfronet.bazaar.engine.extension.bean.IndigoDocument; -import pl.cyfronet.bazaar.engine.extension.component.IndigoDocumentFactory; - -/** - * @author bwilk - * - */ -@ComponentScan("pl.cyfronet") -@SpringBootApplication -@PropertySources({ - @PropertySource("classpath:bootstrap.properties"), - @PropertySource("classpath:hibernate.properties"), - @PropertySource("classpath:auth.properties"), - @PropertySource("classpath:bazaar.properties"), - @PropertySource("classpath:mongo.properties") - }) -public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - -// Document factory is declared as a service, so code below is not needed anymore -// @Bean -// public DocumentFactory getDocumentFactory() { -// return new IndigoDocumentFactory(); -// } -} \ No newline at end of file diff --git a/src/main/java/pl/cyfronet/ltos/controller/DashboardController.java b/src/main/java/pl/cyfronet/ltos/controller/DashboardController.java deleted file mode 100644 index 46c11b2..0000000 --- a/src/main/java/pl/cyfronet/ltos/controller/DashboardController.java +++ /dev/null @@ -1,55 +0,0 @@ -package pl.cyfronet.ltos.controller; - -import java.util.List; - -import javax.transaction.Transactional; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -import pl.cyfronet.ltos.bean.Affiliation; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.bean.legacy.UserFirstSteps; -import pl.cyfronet.ltos.repository.UserRepository; -import pl.cyfronet.ltos.security.PortalUser; - -@Controller -public class DashboardController { - - // TODO rewrite all legacy method to make them similar to repository REST controllers - - - @Autowired - UserRepository userRepo; - - @RequestMapping(value="user/getSteps", method=RequestMethod.GET) - public ResponseEntity customFind() { - UserFirstSteps steps = steps(); - return new ResponseEntity(steps, HttpStatus.OK); - } - - @Transactional - private UserFirstSteps steps() { - UserFirstSteps userFirstSteps = new UserFirstSteps(); - PortalUser pu = (PortalUser) SecurityContextHolder.getContext().getAuthentication(); - User user = pu.getUserBean(); - List affiliations = user.getAffiliations(); - boolean hasAffiliation = false; - if (affiliations != null) { - hasAffiliation = affiliations.stream().anyMatch( - aff -> { - return aff.getStatus() != null - && aff.getStatus().equalsIgnoreCase("ACTIVE"); - }); - } - userFirstSteps.setHasAffiliation(hasAffiliation); - userFirstSteps.setHasResource(false); - userFirstSteps.setHasScienceGateway(false); - return userFirstSteps; - } -} diff --git a/src/main/java/pl/cyfronet/ltos/controller/LegacyMethods.java b/src/main/java/pl/cyfronet/ltos/controller/LegacyMethods.java deleted file mode 100644 index 1f6aa02..0000000 --- a/src/main/java/pl/cyfronet/ltos/controller/LegacyMethods.java +++ /dev/null @@ -1,47 +0,0 @@ -package pl.cyfronet.ltos.controller; - -import lombok.extern.log4j.Log4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.view.RedirectView; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.security.UserInfo; - -import javax.servlet.http.HttpSession; -import java.io.IOException; - -@Controller -@Log4j -public class LegacyMethods { - - @RequestMapping(value = "user/get", method = RequestMethod.GET) - public ResponseEntity getUser() throws IOException { - User user = (User) SecurityContextHolder.getContext().getAuthentication().getDetails(); - if (user == null) { - return new ResponseEntity(HttpStatus.NOT_FOUND); - } - return new ResponseEntity(user, HttpStatus.OK); - } - - @RequestMapping(value = "identity/get", method = RequestMethod.GET) - public ResponseEntity getIndentityOld() throws IOException { - UserInfo user = (UserInfo) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); - if (user == null) { - return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); - } - return new ResponseEntity<>(user, HttpStatus.OK); - } - - @RequestMapping(value = "/auth/logout", method = RequestMethod.GET) - public RedirectView logout(HttpSession session) { - session.invalidate(); - RedirectView redirectView = new RedirectView(); - redirectView.setContextRelative(true); - redirectView.setUrl("/"); - return redirectView; - } -} diff --git a/src/main/java/pl/cyfronet/ltos/controller/bazaar/BazaarConfig.java b/src/main/java/pl/cyfronet/ltos/controller/bazaar/BazaarConfig.java deleted file mode 100755 index d5b521f..0000000 --- a/src/main/java/pl/cyfronet/ltos/controller/bazaar/BazaarConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -package pl.cyfronet.ltos.controller.bazaar; - -import java.util.List; - -import com.agreemount.slaneg.action.ActionContext; -import com.agreemount.slaneg.action.ActionContextFactory; -import com.agreemount.slaneg.fixtures.FileRulesProvidersConfiguration; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.*; - -import com.agreemount.Response; -import com.agreemount.bean.Query; -import com.agreemount.bean.identity.Identity; -import pl.cyfronet.bazaar.engine.rules.GenericYamlProvider; - -/** - * Created by Paweł Szepieniec pawel.szepieniec@gmail.com on 13.02.15. - */ -@Configuration -@EnableAutoConfiguration -@PropertySources({ @PropertySource("classpath:bazaar.properties"), - @PropertySource("classpath:mongo.properties") }) -@ComponentScan( - basePackages = {"pl.cyfronet.bazaar, com.agreemount"}, - excludeFilters = { - @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, - value = FileRulesProvidersConfiguration.class) - } -) -public class BazaarConfig { - - @Autowired - @Qualifier("queriesYamlProvider") - private GenericYamlProvider queriesYamlProvider; - - @Value("${engine.dummyLogin}") - private String dummyLogin; - - @Bean(name = "dummyLogin") - public String dummyLogin() { - return dummyLogin; - } - - @Bean(name = "identitiesYamlProvider") - public GenericYamlProvider metricGenericYamlProvider() { - return new GenericYamlProvider<>("identities"); - } - - - @Bean - public ActionContextFactory getActionContextFactory() { - return new ActionContextFactory<>(ActionContext.class); - } - -} diff --git a/src/main/java/pl/cyfronet/ltos/controller/bazaar/NewDocumentController.java b/src/main/java/pl/cyfronet/ltos/controller/bazaar/NewDocumentController.java deleted file mode 100755 index 029e122..0000000 --- a/src/main/java/pl/cyfronet/ltos/controller/bazaar/NewDocumentController.java +++ /dev/null @@ -1,122 +0,0 @@ -package pl.cyfronet.ltos.controller.bazaar; - -import com.agreemount.bean.metric.Metric; -import com.agreemount.engine.facade.QueryFacade; -import com.agreemount.engine.facade.MetricFacade; -import com.agreemount.EngineFacade; -import com.agreemount.Response; -import com.agreemount.bean.document.Document; -import com.agreemount.bean.identity.Identity; -import com.agreemount.bean.response.ActionResponse; -import com.agreemount.bean.response.RedirectActionResponse; -import com.agreemount.slaneg.action.ActionContext; -import com.agreemount.slaneg.action.ActionContextFactory; -import com.agreemount.slaneg.action.definition.Action; -import com.mashape.unirest.http.Unirest; -import com.mashape.unirest.http.exceptions.UnirestException; -import lombok.extern.log4j.Log4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.web.bind.annotation.*; -import pl.cyfronet.bazaar.engine.rules.GenericYamlProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Controller; -import pl.cyfronet.bazaar.engine.extension.bean.IndigoDocument; -import pl.cyfronet.ltos.bean.Team; -import pl.cyfronet.ltos.bean.User; -import pl.cyfronet.ltos.bean.legacy.CreateGrantData; -import pl.cyfronet.ltos.rest.bean.sla.DocumentAction; -import pl.cyfronet.ltos.security.PortalUser; - -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - - -@Controller -public class NewDocumentController { - - static Logger logger = LoggerFactory - .getLogger(NewDocumentController.class); - - @Value("${cmdb.url}") - private String cmdbUrl; - - @Autowired - private ActionContextFactory actionContextFactory; - - @Autowired - private EngineFacade engineFacade; - - @Autowired - private QueryFacade queryFacade; - - @Autowired - private MetricFacade metricFacade; - - @Autowired - @Qualifier("identitiesYamlProvider") - private GenericYamlProvider identitiesYamlProvider; - - public Identity getByLogin(String login) { - return identitiesYamlProvider.getItems().stream() - .collect(Collectors.toMap(Identity::getLogin, (a) -> a)).get(login); - } - - @RequestMapping(value = "grant/create", method = RequestMethod.PUT) - @ResponseBody - public Response getDocument(final CreateGrantData createGrantData) { - - PortalUser pu = (PortalUser) SecurityContextHolder.getContext().getAuthentication(); - User user = pu.getUserBean(); - - String grantOwnerTeam = createGrantData.getTeam(); - checkTeam(user, grantOwnerTeam); - - Document document = new Document(); - document.setName(createGrantData.getGrantId()); - document.setTeam(grantOwnerTeam); - - /* - * check if user has this team... - */ - - ActionContext actionContext = actionContextFactory.createInstance(document); - actionContext.addDocument("documentDraftFromController", document); - engineFacade.runAction(actionContext, "createNewRequest"); - - document = actionContext.getDocument("newRoot"); - - logger.debug("" + document); - - Response response = new Response<>(); - RedirectActionResponse redirectActionResponse = new RedirectActionResponse(); - redirectActionResponse.setRedirectToDocument(document.getId()); - response.setData(redirectActionResponse); - - return response; - } - - @RequestMapping(value = "api/sites", method = RequestMethod.GET) - @ResponseBody - public String getSites() throws UnirestException { - return Unirest.get(cmdbUrl+"/cmdb/service/list").asString().getBody(); - } - - private void checkTeam(User user, String grantTeam) { - for (Team userTeam : user.getTeams()) { - if (userTeam.getName().equals(grantTeam)) { - return; - } - } - // TODO throw proper exception to match http response - throw new RuntimeException("Not allowed to choose team: " + grantTeam); - } -} diff --git a/src/main/resources/hibernate.properties b/src/main/resources/hibernate.properties index 74e539e..e536e9e 100644 --- a/src/main/resources/hibernate.properties +++ b/src/main/resources/hibernate.properties @@ -5,7 +5,7 @@ hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.generateDdl=true hibernate.id.new_generator_mappings=true hibernate.enable_lazy_load_no_trans=true -entityManager.packagesToScan = pl.cyfronet.ltos.bean +entityManager.packagesToScan = pl.cyfronet.indigo.bean jdbc.driverClassName = com.mysql.jdbc.Driver diff --git a/src/main/resources/rules/actions.yml b/src/main/resources/rules/actions.yml index e7ba212..932fe22 100755 --- a/src/main/resources/rules/actions.yml +++ b/src/main/resources/rules/actions.yml @@ -38,7 +38,7 @@ actions: mainState: draft serviceType: computing sideState: customer - - !pl.cyfronet.bazaar.engine.extension.action.definition.SetOrganizationAsTeam + - !pl.cyfronet.indigo.engine.extension.action.definition.SetOrganizationAsTeam documentAlias: newRoot @@ -80,7 +80,7 @@ actions: mainState: draft serviceType: storage sideState: customer - - !pl.cyfronet.bazaar.engine.extension.action.definition.SetOrganizationAsTeam + - !pl.cyfronet.indigo.engine.extension.action.definition.SetOrganizationAsTeam documentAlias: newRoot - !com.agreemount.slaneg.action.definition.CreateNewLeaf @@ -181,7 +181,7 @@ actions: ## - !com.agreemount.slaneg.constraint.action.definition.HasAnyRoleInRelatedBusinessEntityDef ## documentAlias: BASE # actions: -# - !pl.cyfronet.bazaar.engine.extension.action.definition.CopySite +# - !pl.cyfronet.indigo.engine.extension.action.definition.CopySite # fromAlias: BASE # toAlias: newLeaf @@ -226,7 +226,7 @@ actions: actions: - !com.agreemount.slaneg.action.definition.ChangeState constraint: - !pl.cyfronet.bazaar.engine.extension.constraint.action.definition.IsPublicService + !pl.cyfronet.indigo.engine.extension.constraint.action.definition.IsPublicService negation: true documentAlias: newLeaf metricId: siteStorageSelect @@ -236,14 +236,14 @@ actions: sideState: provider - !com.agreemount.slaneg.action.definition.ChangeState constraint: - !pl.cyfronet.bazaar.engine.extension.constraint.action.definition.IsPublicService + !pl.cyfronet.indigo.engine.extension.constraint.action.definition.IsPublicService documentAlias: newLeaf metricId: siteStorageSelect documentAlias: newLeaf states: mainState: signed sideState: provider -# - !pl.cyfronet.bazaar.engine.extension.action.definition.CopySite +# - !pl.cyfronet.indigo.engine.extension.action.definition.CopySite # fromAlias: BASE # toAlias: newLeaf @@ -297,7 +297,7 @@ actions: states: mainState: signed sideState: provider -# - !pl.cyfronet.bazaar.engine.extension.action.definition.CopySite +# - !pl.cyfronet.indigo.engine.extension.action.definition.CopySite # fromAlias: BASE # toAlias: newLeaf @@ -352,7 +352,7 @@ actions: states: mainState: signed sideState: manager -# - !pl.cyfronet.bazaar.engine.extension.action.definition.CopySite +# - !pl.cyfronet.indigo.engine.extension.action.definition.CopySite # fromAlias: BASE # toAlias: newLeaf @@ -406,7 +406,7 @@ actions: states: mainState: rejected sideState: provider -# - !pl.cyfronet.bazaar.engine.extension.action.definition.CopySite +# - !pl.cyfronet.indigo.engine.extension.action.definition.CopySite # fromAlias: BASE # toAlias: newLeaf @@ -460,7 +460,7 @@ actions: states: mainState: rejected sideState: manager -# - !pl.cyfronet.bazaar.engine.extension.action.definition.CopySite +# - !pl.cyfronet.indigo.engine.extension.action.definition.CopySite # fromAlias: BASE # toAlias: newLeaf @@ -514,7 +514,7 @@ actions: states: mainState: sent sideState: provider -# - !pl.cyfronet.bazaar.engine.extension.action.definition.CopySite +# - !pl.cyfronet.indigo.engine.extension.action.definition.CopySite # fromAlias: BASE # toAlias: newLeaf @@ -567,7 +567,7 @@ actions: states: mainState: sent sideState: manager -# - !pl.cyfronet.bazaar.engine.extension.action.definition.CopySite +# - !pl.cyfronet.indigo.engine.extension.action.definition.CopySite # fromAlias: BASE # toAlias: newLeaf diff --git a/src/main/resources/rules/metrics.yml b/src/main/resources/rules/metrics.yml index b089fca..063fe27 100755 --- a/src/main/resources/rules/metrics.yml +++ b/src/main/resources/rules/metrics.yml @@ -88,7 +88,7 @@ metrics: # state: documentType # value: sla - - !pl.cyfronet.bazaar.engine.extension.metric.SiteSelectMetric + - !pl.cyfronet.indigo.engine.extension.metric.SiteSelectMetric id: siteStorageSelect label: Provider and service categoryId: slaScope @@ -426,7 +426,7 @@ metrics: # storage - - !pl.cyfronet.bazaar.engine.extension.metric.SpaceMetric + - !pl.cyfronet.indigo.engine.extension.metric.SpaceMetric id: spaceSelect label: ONEDATA Space categoryId: slaScope @@ -449,7 +449,7 @@ metrics: state: serviceType value: storage - - !pl.cyfronet.bazaar.engine.extension.metric.SiteSelectMetric + - !pl.cyfronet.indigo.engine.extension.metric.SiteSelectMetric id: siteStorageSelect label: Site categoryId: slaScope diff --git a/src/main/resources/rules/queries.yml b/src/main/resources/rules/queries.yml index b8de7ce..8aa03a3 100755 --- a/src/main/resources/rules/queries.yml +++ b/src/main/resources/rules/queries.yml @@ -61,7 +61,7 @@ queries: position: 3 queryCategoryId: userDashboard visibilityConstraint: -# !pl.cyfronet.bazaar.engine.extension.constraint.action.definition.IsSiteAdmin +# !pl.cyfronet.indigo.engine.extension.constraint.action.definition.IsSiteAdmin # role: provider # !com.agreemount.slaneg.constraint.action.definition.Operator # type: OR @@ -96,7 +96,7 @@ queries: position: 4 queryCategoryId: userDashboard visibilityConstraint: -# !pl.cyfronet.bazaar.engine.extension.constraint.action.definition.IsSiteAdmin +# !pl.cyfronet.indigo.engine.extension.constraint.action.definition.IsSiteAdmin # role: provider # !com.agreemount.slaneg.constraint.action.definition.Operator # type: OR @@ -143,7 +143,7 @@ queries: - !com.agreemount.slaneg.constraint.query.definition.StateEqualsDef state: documentType value: request - - !pl.cyfronet.bazaar.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite + - !pl.cyfronet.indigo.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite siteMetricId: siteName - !com.agreemount.slaneg.constraint.query.definition.IsLeafADef sth: ok @@ -163,7 +163,7 @@ queries: children: - !com.agreemount.slaneg.constraint.action.definition.HasRoleDef role: provider -# - !pl.cyfronet.bazaar.engine.extension.constraint.action.definition.IsSiteAdmin +# - !pl.cyfronet.indigo.engine.extension.constraint.action.definition.IsSiteAdmin # role: provider constraint: #dla jakich dokumentow ma byc widoczna ta kwerenda !com.agreemount.slaneg.constraint.query.definition.Operator @@ -175,7 +175,7 @@ queries: - !com.agreemount.slaneg.constraint.query.definition.StateEqualsDef state: serviceType value: computing - - !pl.cyfronet.bazaar.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite + - !pl.cyfronet.indigo.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite siteMetricId: siteName - !com.agreemount.slaneg.constraint.query.definition.IsLeafADef sth: ok @@ -194,7 +194,7 @@ queries: children: - !com.agreemount.slaneg.constraint.action.definition.HasRoleDef role: provider -# - !pl.cyfronet.bazaar.engine.extension.constraint.action.definition.IsSiteAdmin +# - !pl.cyfronet.indigo.engine.extension.constraint.action.definition.IsSiteAdmin # role: provider constraint: #dla jakich dokumentow ma byc widoczna ta kwerenda !com.agreemount.slaneg.constraint.query.definition.Operator @@ -206,7 +206,7 @@ queries: - !com.agreemount.slaneg.constraint.query.definition.StateEqualsDef state: serviceType value: storage - - !pl.cyfronet.bazaar.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite + - !pl.cyfronet.indigo.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite siteMetricId: siteName - !com.agreemount.slaneg.constraint.query.definition.IsLeafADef sth: ok @@ -235,7 +235,7 @@ queries: - !com.agreemount.slaneg.constraint.query.definition.StateEqualsDef state: serviceType value: computing - - !pl.cyfronet.bazaar.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite + - !pl.cyfronet.indigo.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite siteMetricId: siteName - !com.agreemount.slaneg.constraint.query.definition.IsLeafADef sth: ok @@ -264,7 +264,7 @@ queries: - !com.agreemount.slaneg.constraint.query.definition.StateEqualsDef state: serviceType value: storage - - !pl.cyfronet.bazaar.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite + - !pl.cyfronet.indigo.engine.extension.constraint.query.definition.IsAdministratorInRelatedSite siteMetricId: siteName - !com.agreemount.slaneg.constraint.query.definition.IsLeafADef sth: ok diff --git a/src/main/resources/static/css/bazaar.css b/src/main/resources/static/css/bazaar.css deleted file mode 100644 index eb8a16c..0000000 --- a/src/main/resources/static/css/bazaar.css +++ /dev/null @@ -1,2817 +0,0 @@ -@import url(datepicker.css); - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; -} -body { - line-height: 1; - font-family: 'roboto_condensedregular'; - color: #687378; - font-size: 14px; - background-color: #f2f2f2; -} -ol, ul { - list-style: none; -} -blockquote, q { - quotes: none; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} - -.center{ - width: 1100px; - margin: 0 auto;} -@font-face { - font-family: 'roboto_condensedbold'; - src: url('../fonts/robotocondensed-bold-webfont.eot'); - src: url('../fonts/robotocondensed-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/robotocondensed-bold-webfont.woff2') format('woff2'), - url('../fonts/robotocondensed-bold-webfont.woff') format('woff'), - url('../fonts/robotocondensed-bold-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'roboto_condenseditalic'; - src: url('../fonts/robotocondensed-italic-webfont.eot'); - src: url('../fonts/robotocondensed-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/robotocondensed-italic-webfont.woff2') format('woff2'), - url('../fonts/robotocondensed-italic-webfont.woff') format('woff'), - url('../fonts/robotocondensed-italic-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'roboto_condensedregular'; - src: url('../fonts/robotocondensed-regular-webfont.eot'); - src: url('../fonts/robotocondensed-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/robotocondensed-regular-webfont.woff2') format('woff2'), - url('../fonts/robotocondensed-regular-webfont.woff') format('woff'), - url('../fonts/robotocondensed-regular-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} -@font-face { - font-family: 'roboto_condensedlight'; - src: url('../fonts/robotocondensed-light_0-webfont.eot'); - src: url('../fonts/robotocondensed-light_0-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/robotocondensed-light_0-webfont.woff2') format('woff2'), - url('../fonts/robotocondensed-light_0-webfont.woff') format('woff'), - url('../fonts/robotocondensed-light_0-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} -.italic{font-family: 'roboto_condenseditalic';} -.float-left{float: left;} -.float-right{float: right;} -.green{ color: #7cc576;} -.alert-icon{ - color:#e85b51; - font-size: 18px !important; - padding-left: 10px; - -} -/*--header--*/ -#header{ - background-color:#ffffff; - border-bottom: 1px solid #e5e5e5;} -#top-nav{ - background-color: #157593; - height:45px; - } -.switch{ - float: left; - margin-top: 15px;} -.switch li{ - display: inline-block; - width: 100px; - } -.switch a{ - color: #b1def2; - font-size: 12px; - text-transform:uppercase; - text-decoration: none; - padding: 3px 6px; - } -.switch a:hover{ - color: #dceef6; - -moz-transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - -webkit-transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - -o-transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - -ms-transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - transition: color 0.25s ease-in-out, background 0.25s ease-in-out;} - - - -.switch a.active{ - color: #004563; - border-radius: 3px; - cursor: default; - - background: #e0eff6; /* Old browsers */ - background: -moz-linear-gradient(top, #e0eff6 0%, #c9e4f0 2%, #bcdeec 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e0eff6), color-stop(2%,#c9e4f0), color-stop(100%,#bcdeec)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #e0eff6 0%,#c9e4f0 2%,#bcdeec 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #e0eff6 0%,#c9e4f0 2%,#bcdeec 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #e0eff6 0%,#c9e4f0 2%,#bcdeec 100%); /* IE10+ */ - background: linear-gradient(to bottom, #e0eff6 0%,#c9e4f0 2%,#bcdeec 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0eff6', endColorstr='#bcdeec',GradientType=0 ); /* IE6-9 */ - - } - -.notification{ - float: left; - margin-left: 59%; - margin-top: 7px; - position: relative;} -.bell{ - display: block; - background:url(img/bell.png) top left no-repeat; - width: 20px; - height: 20px; - position: absolute; - top: 7px; - - } -.bell-number { - width: 16px; - height: 16px; - display:block; - background-color: #e85b51; - color: #ffffff; - text-align: center; - font-size: 11px; - font-family: 'roboto_condensedbold'; - border-radius: 10px; - position:absolute; - left: 18px; - line-height: 120%; - } - -.main-menu{ - height: 65px;} -#main-nav ul{ - margin-top: 15px;} -#main-nav li{ - display: inline; - margin-left: 30px;} -#main-nav{ - float: right; - text-transform:uppercase; - } -#main-nav a{ - color: #8d999f; - font-size: 16px; - padding-top: 10px; - padding-bottom: 20px; - display: inline-block; - text-decoration: none;} -#main-nav a:hover{ - border-bottom: 4px solid #d8d5d5; - -moz-transition: border-bottom 0.25s ease-in-out, background 0.25s ease-in-out; - -webkit-transition: border-bottom 0.25s ease-in-out, background 0.25s ease-in-out; - -o-transition: border-bottom 0.25s ease-in-out, background 0.25s ease-in-out; - -ms-transition: border-bottom 0.25s ease-in-out, background 0.25s ease-in-out; - transition: border-bottom 0.25s ease-in-out, background 0.25s ease-in-out; - - } -#main-nav a.active{ - border-bottom: 4px solid #e85b51;} - - -#logo{ - display:block; - background:url(img/logo.png) top left no-repeat; - width: 46px; - height: 44px; - float: left; - margin-top: 11px; - } -.lang{ - float: right; - color: #ffffff; - margin-top: 15px; - } -.lang li{ - display: inline-block; - padding-left: 1px; - margin-left: 1px;} -.lang a{ - color: #c5e2ef; - text-transform: uppercase;} -.lang a:hover{ - text-decoration: none;} -.lang .active a{ - color: #ffffff; - font-family: 'roboto_condensedbold'; - text-decoration: none; - cursor: default; - } - /*--main--*/ - -#main{ - - padding-top:30px; - padding-bottom: 30px; - - } -#breadcrumbs li{ - display: inline; - padding-right: 6px;} -#breadcrumbs li+li{ - background:url(img/breadcrumb-spacer.gif) left no-repeat; - padding-left: 14px; - - } -#breadcrumbs a, #breadcrumbs p{ - color: #a3adb2; - display: inline; - font-size: 12px;} - -#breadcrumbs a:hover{ - text-decoration: none;} -#left-menu{ - width: 198px; - background-color: #ffffff; - border: 1px solid #cccaca; - margin-top: 30px; - - } -#left-menu li+li{ - border-top: 1px solid #e1e0e0;} -#left-menu a{ - color: #8d999f; - text-decoration: none; - display: block; - padding-top: 17px; - padding-bottom: 17px; - font-family: 'roboto_condensedbold'; - padding-left: 60px; - background-position: 15px; - } -#left-menu a:hover{ - - opacity: 0.8; - -moz-transition: opacity 0.25s ease-in-out, background 0.25s ease-in-out; - -webkit-transition: opacity 0.25s ease-in-out, background 0.25s ease-in-out; - -o-transition: opacity 0.25s ease-in-out, background 0.25s ease-in-out; - -ms-transition: opacity 0.25s ease-in-out, background 0.25s ease-in-out; - transition: opacity 0.25s ease-in-out, background 0.25s ease-in-out; -} -.dashboard { - background:url(../img/ico1.png) left no-repeat;} -.afiliacje { - background:url(../img/ico2.png) left no-repeat;} -.zespoly { - background:url(../img/ico3.png) left no-repeat;} -.podopieczni { - background:url(../img/ico4.png) left no-repeat;} -.konta { - background:url(../img/ico5.png) left no-repeat;} -.granty { - background:url(../img/ico6.png) left no-repeat;} -.profil { - background:url(../img/ico7.png) left no-repeat;} -.cert { - background:url(../img/ico8.png) left no-repeat;} -.kapl { - background:url(../img/ico9.png) left no-repeat;} -.services { - background:url(../img/ico10.png) left no-repeat;} -.proj { - background:url(../img/ico11.png) left no-repeat;} - -#left-menu li.active a{ - color: #e85b51; - border-left: 5px solid #e85b51; -} -li.active .dashboard { - background:url(../img/ico1a.png) left no-repeat;} -li.active .afiliacje { - background:url(../img/ico2a.png) left no-repeat;} -li.active .zespoly { - background:url(../img/ico3a.png) left no-repeat;} -li.active .podopieczni { - background:url(../img/ico4a.png) left no-repeat;} -li.active .konta { - background:url(../img/ico5a.png) left no-repeat;} -li.active .granty { - background:url(../img/ico6a.png) left no-repeat;} -li.active .profil { - background:url(../img/ico7a.png) left no-repeat;} -li.active .cert { - background:url(../img/ico8a.png) left no-repeat;} -li.active .kapl { - background:url(../img/ico9a.png) left no-repeat;} -li.active .services { - background:url(../img/ico10a.png) left no-repeat;} -li.active .proj { - background:url(../img/ico11a.png) left no-repeat;} - -#left-menu li.active li a{ - color: #8d999f; - font-size: 13px; - border-left: 5px solid #f2cfcd; - font-family: 'roboto_condensedregular'; - } - -#left-menu li.active li.active a { - background-color:#f2f2f2; - width:70%; -} -.arrow_box { - position: relative; - background-color: #ffffff; - border-bottom: 1px solid #e1e0e0; -} -.arrow_box:after , .arrow_box:before { - top: 100%; - left: 60%; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; -} - -.arrow_box:after { - border-color: #ffffff); - border-top-color: #ffffff; - border-width: 6px; - margin-left: -30px; -} -.arrow_box:before { - border-color: #ffffff; - border-top-color: #e1e0e0; - border-width: 7px; - margin-left: -31px; -} - - - - - -.left-section{ - float: left; - width: 20%} -.right-section{ - float: right; - width: 78%; - margin-top: 30px;} -.content-section{ - width: 78%; - margin: 0 auto;} -h1{ font-family: 'roboto_condensedlight'; - font-size: 36px; - color: #0c6389; - margin-bottom: 20px; - float: left; - width: 70%;} - -h3{ - font-size: 18px; - color: #6a8794; - font-family: 'roboto_condensedbold'; - padding-bottom: 13px; - margin-bottom: 20px; - border-bottom: 1px solid #b1c0c7; - margin-top: 30px;} -h4{ - font-size: 16px; - color: #6a8794; - font-family: 'roboto_condensedbold'; - padding-bottom: 10px; - margin-top:5px; - margin-bottom: 10px;} - - -.back{ - margin-bottom: 20px; - display: block;} -.back i{padding-right: 5px;} -.line{ - border-bottom: 1px solid #b1c0c7; - margin-top: 20px; - margin-bottom: 20px; -} -.end-line{ - border-bottom: 4px solid #b1c0c7; - margin-top: 20px; - margin-bottom: 20px;} - -.main-content{ - background-color: #ffffff; - padding: 20px; - border-top: 1px solid #abd0e0} -.right-section a{ - color: #0076a3;} - .right-section a:hover{ - text-decoration: none;} -.content-section a{ - color: #0076a3;} -.content-section a:hover{ - text-decoration: none;} -/*--footer--*/ - -#footer{ - border-top: 1px solid #cccaca; - padding-top:16px; - margin-top: 20px; - padding-bottom: 70px; - - } -#footer p{ - float: left; - width: 30%;} -#footer nav{ - float: right;} -#footer p, #footer nav a{ - font-size: 11px; - color: #8d999f; - text-decoration: none; - } -#footer nav a:hover{ - opacity: 0.8; - -moz-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - -webkit-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - -ms-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out;} - -#footer nav li{ - display: inline; - padding-left: 30px;} - - - - - -/* Nav */ - - .user-menu { - cursor: default; - float: left; - margin-left: 60px; - margin-top: 15px; - } - .user-menu i{ - padding-left: 5px;} - - .user-menu > ul > li > a { - border: 0; - text-decoration: none; - color: #f1f0ef; - outline: 0; - } - - .user-menu > ul > li > a:before { - display: inline-block; - background: #878787; - color: #e4e4e4; - width: 1.65em; - height: 1.65em; - border-radius: 1.65em; - line-height: 1.65em; - text-align: center; - box-shadow: 0.125em 0.175em 0 0 rgba(0, 0, 0, 0.125); - margin-right: 0.75em; - -moz-transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - -webkit-transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - -o-transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - -ms-transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - transition: color 0.25s ease-in-out, background 0.25s ease-in-out; - } - - .user-menu > ul > li > a > span { - -moz-transition: color 0.25s ease-in-out; - -webkit-transition: color 0.25s ease-in-out; - -o-transition: color 0.25s ease-in-out; - -ms-transition: color 0.25s ease-in-out; - transition: color 0.25s ease-in-out; - } - - .user-menu > ul > li.active > a:before, .user-menu > ul > li:hover > a:before { - background: #ED786A; - color: #fff; - } - - .user-menu > ul > li.active > a > span, .user-menu > ul > li:hover > a > span { - color: #c5e2ef; - } - - .dropotron { - text-align: left; - border: solid 1px #e5e5e5; - border-radius: 4px; - background: #fff; - background: rgba(255, 255, 255, 0.965); - box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.1); - - min-width: 9.9em; - margin-top: calc(-0.5em + 1px); - margin-left: -2px; - } - - .dropotron.level-0 { - margin-top: 1.5em; - margin-left: -1em; - } - - .dropotron.level-0:after { - content: ''; - display: block; - position: absolute; - right: 1.25em; - top: calc(-0.75em + 1px); - border-left: solid 0.75em rgba(255, 255, 255, 0); - border-right: solid 0.75em rgba(255, 255, 255, 0); - border-bottom: solid 0.75em #fff; - } - - .dropotron.level-0:before { - content: ''; - display: block; - position: absolute; - right: 1.25em; - top: -0.75em; - border-left: solid 0.75em rgba(255, 255, 255, 0); - border-right: solid 0.75em rgba(255, 255, 255, 0); - border-bottom: solid 0.75em #ccc; - } - - .dropotron span, .dropotron a { - display: block; - padding: 1em 2em 1em 4em; - border: 0; - border-top: solid 1px #f0f0f0; - outline: 0; - color: #e85b51; - text-decoration: none; - } - - .dropotron li:first-child > span, .dropotron li:first-child > a { - padding-top: 1em !important; - - border-top: 0; - padding-top: 0; - } - - .dropotron li:hover > span, .dropotron li:hover > a { - -moz-transition: color 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - -webkit-transition: color 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - -ms-transition: color 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - transition: color 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - color: #ed786a; - } - - - -.logout-ico{ - background:url(img/ico-logout.png) left no-repeat} - -.user-ico{ - background:url(img/ico-user.png) left no-repeat} - -.logout-ico, .user-ico{ - background-position: 20px; -} -.logout-ico:hover, .user-ico:hover{ - opacity: 0.8; - -moz-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - -webkit-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - -ms-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out;} - - -/*form*/ -.form-group{ - display: table; - margin-bottom: 10px; - } -.form-group.blue-bg{ - background-color: #dce9ef; - padding: 30px 20px;} -.form-group label{ - width: 166px; - display: inline-block; - padding-right: 20px; - display: table-cell; - vertical-align: middle; - } -input[type="text"], select, -input[type="number"]{ - width: 300px; - border: 1px solid #a9a9a9; - padding: 6px 10px; - font-family: 'roboto_condensedregular'; - color: #333333; - font-size: 14px; - border-radius: 3px; - background: -moz-linear-gradient(top, #dcdcdc 0%, #ffffff 5%, #ffffff 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dcdcdc), color-stop(5%,#ffffff), color-stop(100%,#ffffff)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* IE10+ */ - background: linear-gradient(to bottom, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dcdcdc', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */ - -} -input[type="text"].calendar{ - width: 110px; - margin-left: 5px; - background:url(img/calendar-ico.png) right no-repeat; - background-position: 106px; - - } - -select{ - width: 320px;} -.hint{ - color: #9ea6ab; - font-size: 11px; - width: 290px; - margin-left: 12px; - display: table-cell; - vertical-align: middle; - padding-left: 14px; - } - -.info{ - background-color: #f5f4dd; - padding: 20px; - color: #414a4e; - margin-bottom: 20px;} -.info p{ - float: left; - width: 70%; - margin-top: 9px;} -.info span{ - padding-right: 10px;} - -.button-margin{ - margin-left: 10px;} - - - -/*tabs*/ - -#tabs { - overflow: hidden; - width: 100%; - margin: 0; - padding: 0; - list-style: none; -} - -#tabs li { - float: left; - margin:0; - z-index: 1; - position: relative; -} - -#tabs a { - font-family: 'roboto_condensedbold'; - float: left; - position: relative; - padding: 0 40px; - line-height: 30px; - text-decoration: none; - color: #a3aeb3; - background-color: #e0ecf1; - border-bottom-color: #777\9; - z-index: 2; -} - -i.fa-close { - position: absolute; - z-index: 999; - right: 10px; - top: 9px; - font-size: 12px; - cursor: pointer; -} - -#tabs a:hover, -#tabs a:focus { - background-color: #e0ecf1; - opacity: 0.7; - filter: alpha(opacity=100); -} - -#tabs a:focus { - outline: 0; -} - -#tabs .active a{ - z-index: 3; - background-color:#ffffff; - color: #687378; - opacity: 1; - filter: alpha(opacity=100); - border-top: 1px solid #cacacb; - border-left: 1px solid #cacacb; - border-right: 1px solid #cacacb; - border-bottom: 1px solid #ffffff; -} - -#tabs-content{ - background-color: #ffffff; - min-height: 50px; - padding: 20px 10px;; -} -div.gradient-bg{ -/* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#cacacb+0,ffffff+51,ffffff+100 */ -background: #cacacb; /* Old browsers */ -background: -moz-linear-gradient(top, #cacacb 0%, #ffffff 61%, #ffffff 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#cacacb), color-stop(61%,#ffffff), color-stop(100%,#ffffff)); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, #cacacb 0%,#ffffff 61%,#ffffff 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, #cacacb 0%,#ffffff 61%,#ffffff 100%); /* Opera 11.10+ */ -background: -ms-linear-gradient(top, #cacacb 0%,#ffffff 61%,#ffffff 100%); /* IE10+ */ -background: linear-gradient(to bottom, #cacacb 0%,#ffffff 61%,#ffffff 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cacacb', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */ -padding: 1px; - -margin-top: -1px; - - } - -#tabs-content h4{ - float: left; - width: 60%;} - -/*table*/ - -table { - width: 100%; - border-collapse: collapse; -} -thead{ - border: 1px solid #abd0e0;} - -tbody{ -border-left: 1px solid #cccaca; -border-right: 1px solid #cccaca; -border-bottom: 1px solid #cccaca; -} -th { - padding: 10px 4px; - background: #d1e4ed; - color: #6a8794; - text-transform:uppercase; - -} -td{ - padding: 10px 7px; - border-bottom: 1px solid #cbc9c9; - text-align: left; -} - -table select{ - width: 220px; - padding: 3px 10px; - } - - -.align-center{ - text-align: center;} -.align-left{ - text-align: left;} - -/*lists*/ -.list-short{ - width: 50%;} -.list li, .list-short li{ -line-height: 120%; -padding-top: 14px; -padding-bottom: 14px; -} -.simple-list li{ -line-height: 120%; -padding-top: 6px; -padding-bottom: 6px; -} - -.list li+li, .list-short li+li{ - border-top: 1px solid #cfd8dc;} - -.list li div, .simple-list li div, .list-short li div{ - display: inline-block; -} -.list-title{ - float: left; - width: 20%; - margin-right: 10%;} -.list-desc{ - width: 70%;} -.list-short .list-title, .list-short .list-desc{ - width:45%; -} - -/*buttons*/ - -.button i{ - padding-left: 5px; - font-size: 10px; - } -.button{ - font-family: 'roboto_condensedregular'; - border-radius: 5px; - text-decoration: none; - padding: 7px 16px; - color: #ffffff !important; - display: inline-block; - cursor: pointer; - } -input.button{ - padding: 6px 16px; - font-size:14px; - } -.button:hover{ - opacity:0.8; - -moz-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - -webkit-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - -ms-transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out; - transition: opacity 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out;} - -.green-border-button{ - color: #69b163 !important; - border: 1px solid #69b163; - background-color: transparent; - } -.red-border-button{ - color: #e85b51 !important; - border: 1px solid #e85b51; - background-color: transparent; - } -.green-button{ - border: 1px solid #69b163; - background-color: #69b163; - color: #ffffff; - font-size: 14px;} - -.red-button{ - border: 1px solid #e85b51; - background-color: #e85b51; - font-size: 14px;} - -button:disabled, -button:hover:disabled{ - color: #fff; - cursor: default; - opacity: 0.2; - background: #000; - border: none; -} - -/*modalbox*/ - -.modal-box { - display: none; - position: absolute; - z-index: 1000; - width: 438px; - background: white; - box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); - border: 1px solid rgba(0, 0, 0, 0.1); - background-clip: padding-box; -} - -.modal-box header, -.modal-box .modal-header { - padding: 1.25em 1.5em; - -} - -.modal-box header h3, -.modal-box header h4, -.modal-box .modal-header h3, -.modal-box .modal-header h4 { margin: 0; } - -.modal-box .modal-body { padding: 1em 1.5em; } - -.modal-box footer, -.modal-box .modal-footer { - padding: 1em; - border-top: 1px solid #ddd; - background: rgba(0, 0, 0, 0.02); - -} - -.modal-overlay { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - left: 0; - z-index: 900; - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0.3) !important; -} - -a.close { - line-height: 1; - font-size: 1.5em; - position: absolute; - top: 5%; - right: 2%; - text-decoration: none; - color: #bbb; -} - -a.close:hover { - color: #222; - -webkit-transition: color 1s ease; - -moz-transition: color 1s ease; - transition: color 1s ease; -} -.modal-body table{ - border: 1px dashed #b3bdc2; - margin-top: 20px; - width: 100%;} - -.modal-body td{ - vertical-align: middle; - border-top: 1px dashed #b3bdc2; - border-bottom: 1px dashed #b3bdc2; - padding: 6px; - } -input[type="text"].search{ - margin-top:20px; - width: 328px; - border-right: none; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; - - } -input[type="text"].search:focus{ - outline: none;} -.search-icon{ - width: 10px; - border: 1px solid #a9a9a9; - border-left: none; - margin-left:-3px; - padding: 7px 10px; - color: #333333; - font-size: 14px; - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - background: -moz-linear-gradient(top, #dcdcdc 0%, #ffffff 5%, #ffffff 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dcdcdc), color-stop(5%,#ffffff), color-stop(100%,#ffffff)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* IE10+ */ - background: linear-gradient(to bottom, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dcdcdc', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */} - -.search-icon i{ - color:#eff7ee; - background-color: #7cc576; - padding:4px; - border-radius:2px;} - - -/*logowanie*/ - -.center-section{ - width: 400px; - margin: 0 auto; - padding: 20px;} - -.form-log label{ - display: block; - margin-bottom: 8px;} -.form-log input[type="text"], .form-log input[type="password"]{ - margin-bottom: 20px; - width: 92%; - border: 1px solid #a9a9a9; - padding: 8px 13px; - font-family: 'roboto_condensedregular'; - color: #333333; - font-size: 14px; - border-radius: 3px; - background: -moz-linear-gradient(top, #dcdcdc 0%, #ffffff 5%, #ffffff 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dcdcdc), color-stop(5%,#ffffff), color-stop(100%,#ffffff)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* IE10+ */ - background: linear-gradient(to bottom, #dcdcdc 0%,#ffffff 5%,#ffffff 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dcdcdc', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */ - } - -.center-section a { - color: #0076a3; -} -#logo-log{ - - display: block; - background: url(img/logo.png) top left no-repeat; - width: 46px; - height: 44px; - float: left; - margin-right: 20px; - -} -.center-section h1{ - width:100%} -.log-button{ - margin-right: 20px} - -.log-grey-text{ - font-size: 16px; - color: #b1c0c7; - margin-bottom: 15px;} -.log-text{ - margin-bottom: 15px;} - -.log-left-site{ - float: left; - width: 27%; - padding-left:15px; - padding-top:10px;} - - -/*box*/ - -.box{ - border-left: 1px solid #cccaca; - border-right: 1px solid #cccaca; - border-bottom: 1px solid #cccaca; - padding: 20px; - border-top-style: solid; - border-top-width: 3px; - margin-top: 14px; - margin-bottom: 14px; - } -.box p { - margin-bottom: 6px; - float: right; - width: 95.5%;} -.box .fa{ - font-size: 18px; - } -.error-box{ - color: #ff0000; - border-top-color: #ff0000; - background-color: rgba(255, 0, 0, 0.11); - } -.success-box{ - color: #39b54a; - border-top-color: #39b54a; - background-color: rgba(57, 181, 74, 0.17); -} -.info-box{ - color: #0072bc; - border-top-color: #0072bc; - background-color: rgba(0, 174, 239, 0.15); - } -.warning-box{ - color: #e0a902; - border-top-color: #ffc000; - background-color: #f5f4dd; - } - -/*certyfikaty*/ - -.right-section header p{ - width: 100%; - float: left; - line-height: 130%; - margin-bottom: 20px;} - -.cert-box{ - border-left: 1px solid #f2f2f2; - border-right: 1px solid #f2f2f2; - border-bottom: 1px solid #d9d9d9; - box-shadow: 1px 1px #f2f2f2; - margin-bottom: 10px; - padding: 10px; - position: relative; - line-height: 120%;} -.cert-box h3{ - margin-top: 0px; - border-bottom: none; - margin-bottom: 10px; - float: left;} -.cert-box .hint{ - float: right; - width: auto; - color: #687378;} -.cert-box input[type="text"]{ - width: 200px; - margin-right: 20px; - } - - -.cert-box:hover { - background: #fff6c4; - - } - -.form-group label.narrow-label{ - width: 130px; - padding-right: 10px;} -.cert-box input.narrow-input{ - width: 137px;} -.cert-text-info{ - float: left; - width: 80%;} -.pos-right{ - position: absolute; - right: 20px;} - - - -/*----zmiany 30.09----*/ -h5{ - font-size: 11px; - text-transform: uppercase; - color: #4f5758; - padding-top: 16px; - padding-bottom: 11px; - font-family: 'roboto_condensedbold';} -.bold{ - font-family: 'roboto_condensedbold';} -table.link12 a{ - font-size: 12px;} -.green-text{ - color: #69b163;} -.right-section a.grey-arrow{ - color: #8d999f; - text-shadow: 1px 1px #ffffff;} -.grey-bg{ - background-color: #e1e0e0; - } -.list-item-active{ - background: #f5f4dd;} -ul.tree, ul.tree ul { - list-style-type: none; - background: url(img/vline.png) repeat-y; - margin: 0; - padding: 0; - font-size: 13px; - - } - - ul.tree ul { - margin-left: 10px; - } - - ul.tree li { - margin: 0; - padding: 0 12px; - line-height: 20px; - background: url(img/node.png) no-repeat; - line-height:180%; - - } - - ul.tree li.last { - background: #f5f4dd url(img/lastnode.png) no-repeat; - } - ul.tree li.first.last { - background-image: none; - } - - - - - input[type="text"].eye{ - width: 110px; - margin-left: 5px; - padding-right: 30px; - background:url(img/eye.png) right no-repeat; - background-position: 122px; - - } - - - .signup-signin { - cursor: default; - position: absolute; - right: 100px; - margin-top: 8px; - } - .signup-signin li{display: inline-block; - padding-right: 15px;} - .signup-signin i{ - padding-left: 5px;} - - .signup-signin > ul > li > a { - border: 0; - color: #c5e2ef; - outline: 0; - } - -.center{ - position: relative;} - - -/*katalog aplikacji*/ -p{ line-height: 120%;} -h6{ - color: #0076a3; - font-size: 16px; - font-family: 'roboto_condensedbold'; - padding-bottom: 10px;} -.cat{ - width: 30%; - margin-left: 3%; - margin-right:3%; - padding-left: 110px; - margin-bottom: 20px; - margin-top: 20px; - min-height:80px; - } -.cat-one{ - background:url(img/cat1.png) left no-repeat;} -.cat-two{ - background:url(img/cat2.png) left no-repeat;} -.cat-three{ - background:url(img/cat3.png) left no-repeat;} -.cat-four{ - background:url(img/cat.png) left no-repeat;} - -.apps{ - float: left; - width: 30%; - } -.apps+.apps{ - margin-left: 5%} -::-webkit-input-placeholder{ - color: #9ea6ab; - font-size: 12px; - font-family: 'roboto_condenseditalic';} -:-moz-placeholder{ - color: #9ea6ab; - font-size: 12px; - font-family: 'roboto_condenseditalic';} -::-moz-placeholder{ - color: #9ea6ab; - font-size: 12px; - font-family: 'roboto_condenseditalic';} -:-ms-input-placeholder { - color: #9ea6ab; - font-size: 12px; - font-family: 'roboto_condenseditalic';} -.search-group{ - PADDING-TOP: 20PX; - padding-bottom: 20px;} -#search{ - width: 690px; - padding-left: 10px; - padding-right: 10px;} -.search-button{ - background-image: url(img/search.png); - background-repeat:no-repeat; - background-position:center; - width: 90px; - position: relative; - top: 4px; - margin-left: 10px;} -.cat-menu{ - padding-top: 10px; - padding-bottom: 10px;} -#left-menu.cat-menu li{ - font-size: 11px; - padding-top: 7px; - padding-bottom:7px; - color: #444e53; - padding-left: 20px; - text-transform: uppercase; - font-family: 'roboto_condensedbold';} -#left-menu.cat-menu li:first-child { - padding-top: 17px; - padding-bottom: 17px;} -#left-menu.cat-menu li+li{border: none;} -#left-menu.cat-menu ul+ul{border-top: 1px solid #e1e0e0;} -#left-menu.cat-menu li a{ - font-size: 13px; - color: #8d999f; - padding-top: 0px; - padding-bottom: 0px; - padding-left: 0px; - text-transform:none; - font-family: 'roboto_condensedregular';} - -#left-menu .blue-link, #left-menu li a.blue-link{ - color: #0076a3; - font-family: 'roboto_condensedregular'; - font-size: 13px; - text-decoration:underline;} - - -/*25.10*/ - -#search.search-short { - width: 480px;} -.select-short{ - width: 200px;} -.blue-button{ - border: 1px solid #157593; - background-color: #d3e5eb; - color: #157593 !important; - font-size: 14px;} -.blue-button-line{ - border: 1px solid #157593; - background-color:#ffffff; - color: #157593 !important; - font-size: 14px;} -.view-1{ - display:inline-block; - background:url(img/view1.gif) top left no-repeat; - width:16px; - height: 14px; - margin-left: 10px;} -.view-2{ - display:inline-block; - background:url(img/view2.gif) top left no-repeat; - width:16px; - height: 14px; - margin-left: 6px;} -.cat-buttons{ - width: 350px; - position: relative; - top: -57px; - float: right;} -.application-desc{ - padding-top: 20px; - position: relative; - padding-bottom: 20px; - padding-top: 20px; - } -.application-desc .button{ - position: absolute; - right: 0; - top: 9px; - } -.application-desc+.application-desc{ - border-top: 1px solid #e1e0e0; -} - -.application-classification{ -margin-top: 20px; - background-color: #e3f5fa; - font-size: 11px; - padding: 13px; - color: #687378;} -.application-classification span{ - color: #9ea6ab; - padding-left: 5px; - font-family: 'roboto_condenseditalic'; } -.launched{ - color: #67b261 !important; - text-decoration: none; - font-size: 14px; - position: absolute; - right: 0; - top: 18px;} - - -/*instancje*/ -.app-table tbody{ border: none;} -.app-table th{ - color: #6a8794; - text-transform: uppercase; - background: none; - border-bottom: 5px solid #e1e0e0;} -.app-table th, .app-table td{ - text-align: left;} -.app-table a{text-decoration: none;} - - -/*granty*/ -.grant-header{ - padding-bottom: 25px;} -.grant-header .button{ - /*float: right;*/ - margin-left: 6px;} -.grant-header h7{ - color: #687378; - text-transform: uppercase; - font-size: 12px; - font-family: 'roboto_condensedbold'; - position: relative; - top: 10px; } - -h7.h_docs{ - margin-right: 136px; - } - -#tabs .blue-plus-button a, -#tabs .blue-plus-button{ - background-color: #157593; - color: #ffffff; - /*position: absolute;*/ - /*top: 160px;*/ - /*right: 180px;*/ - height: 30px; - width: 31px; - } -#tabs .blue-plus-button a { - padding: 0 5px; -} - -.blue-plus-button .fa{ - position: relative; - font-size:11px; - left: 11px;} -.right-section a.blue-plus-button{ - color: #ffffff;} -.form-group.form-grant{ - margin-bottom: 20px;} -.form-group.form-grant label{ - display:block; - width: auto; - margin-bottom: 10px; -} -.form-group.form-grant .hint{ - position: relative; - top: 10px;} - - -.grant-view-details .header-form-grant { - overflow: hidden; - font-size: 16px; - width: 43%; - float: left; - } - -.grant-view-details .header-form-grant i { - float:left; - margin-right: 5px; - opacity: 0.3; - } - -.grant-view-details .header-form-grant label { - /*float: left;*/ - display: inline; - } - - - -.grant-view-details .grant-details { - width: 55%; - float: right; -} - -.grant-view-details { - padding-bottom: 8px; - margin-bottom: 2px; - border-bottom: 1px dashed #a3adb2; - width: 100%; - overflow: auto; -} - -.metrics-unit { - /*display:block;*/ - font-style: italic; - font-size: 0.7em; - margin: 2px 0 0 3px; -} - - -.form-columns{ - width: 50%; - float: left;} -textarea{ - width: 96%; - height: 180px; - resize: none; - border: 1px solid #a9a9a9; - padding: 6px 10px; - font-family: 'roboto_condensedregular'; - color: #333333; - font-size: 14px; - border-radius: 3px; - background: -moz-linear-gradient(top, #dcdcdc 0%, #ffffff 2%, #ffffff 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dcdcdc), color-stop(2%,#ffffff), color-stop(100%,#ffffff)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #dcdcdc 0%,#ffffff 2%,#ffffff 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #dcdcdc 0%,#ffffff 2%,#ffffff 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #dcdcdc 0%,#ffffff 2%,#ffffff 100%); /* IE10+ */ - background: linear-gradient(to bottom, #dcdcdc 0%,#ffffff 2%,#ffffff 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dcdcdc', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */ - margin-top: 10px;} - -.form-group.form-grant input[type="radio"]+input[type="radio"]{ - margin-left: 20px;} -#tabs a.grant-tabs { - padding: 0 27px;} -#tabs a.grant-tabs .fa{ - margin-left: 20px;} -.storage-form.blue-bg{ - width: 95%;} -.storage-form.blue-bg label{ - width: 260px;} -.storage-form input{ - width: 160px;} -.storage-plc{ - margin-top: 30px;} - .form-group.storage-plc label{ - width: 50px;} - .form-group.storage-plc label, .form-group.storage-plc .hint { - vertical-align: top;} - -.metryki{ - position: relative;} -.metryki-button{ - position: absolute; - top: -10px; - right:0px;} -.metryki.cert-box .hint{ - color: #9ea6ab; - font-size: 11px; - width: 90px; - float: none; - margin-left: 12px; - display: table-cell; - vertical-align: middle; - padding-left: 4px;} - -.metryki .form-group label{ - width: 266px;} - -.grey-line{ - width:10px; - width:100%; - border-bottom: 1px solid #dddddd; - margin-bottom: 10px;} - -.button.small-button{ -font-size: 11px; -padding: 4px 16px;} - -.metryki.cert-box input[type="text"]{ - width: 150px;} - - -table.form-grant tbody{border: none !important;} - -.blocker { - position: fixed; - top: 0; right: 0; bottom: 0; left: 0; - width: 100%; height: 100%; - overflow: auto; - z-index: 1; - padding: 20px; - box-sizing: border-box; - background-color: rgb(0,0,0); - background-color: rgba(0,0,0,0.75); - text-align: center; -} -.blocker:before{ - content: ""; - display: inline-block; - height: 100%; - vertical-align: middle; - margin-right: -0.05em; -} -.modal { - display: inline-block; - vertical-align: middle; - position: relative; - z-index: 2; - width: 660px; - background: #fff; - padding: 15px 30px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - -o-border-radius: 8px; - -ms-border-radius: 8px; - border-radius: 8px; - -webkit-box-shadow: 0 0 10px #000; - -moz-box-shadow: 0 0 10px #000; - -o-box-shadow: 0 0 10px #000; - -ms-box-shadow: 0 0 10px #000; - box-shadow: 0 0 10px #000; - text-align: left; -} - -.modal a.close-modal { - position: absolute; - top: -12.5px; - right: -12.5px; - display: block; - width: 30px; - height: 30px; - text-indent: -9999px; - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAACXBIWXMAAAsTAAALEwEAmpwYAAAABGdBTUEAANjr9RwUqgAAACBjSFJNAABtmAAAc44AAPJxAACDbAAAg7sAANTIAAAx7AAAGbyeiMU/AAAG7ElEQVR42mJkwA8YoZjBwcGB6fPnz4w/fvxg/PnzJ2N6ejoLFxcX47Rp036B5Dk4OP7z8vL+P3DgwD+o3v9QjBUABBALHguZoJhZXV2dVUNDgxNIcwEtZnn27Nl/ZmZmQRYWFmag5c90dHQY5OXl/z98+PDn1atXv79+/foPUN9fIP4HxRgOAAggRhyWMoOwqKgoq6GhIZe3t7eYrq6uHBDb8/Pz27Gysloga/jz588FYGicPn/+/OapU6deOnXq1GdgqPwCOuA31AF/0S0HCCB0xAQNBU4FBQWB0NBQublz59oADV37Hw28ePHi74MHD/6ii3/8+HEFMGQUgQ6WEhQU5AeZBTWTCdkigABC9ylIAZeMjIxQTEyMysaNG/3+/v37AGTgr1+//s2cOfOXm5vbN6Caz8jY1NT0a29v76/v37//g6q9sHfv3khjY2M5YAgJgsyEmg0PYYAAQreUk4+PT8jd3V1l1apVgUAzfoIM2rlz5x9gHH5BtxAdA9PB1zNnzvyB+R6oLxoopgC1nBPZcoAAgiFQnLIDMb+enp5iV1eXBzDeHoI0z58//xcwIX0mZCkMg9S2trb+hFk+ffr0QCkpKVmQ2VA7QHYxAgQQzLesQMwjIiIilZWVZfPu3bstMJ+SYikyBmUzkBnA9HEMyNcCYgmQHVC7mAACCJagOEBBbGdnp7lgwYJEkIavX7/+BcY1SvAaGRl9tba2xohjMTGxL8nJyT+AWQsuxsbG9vnp06e/QWYdPHiwHmiWKlBcCGQXyNcAAQSzmBuoSQqYim3u37+/EKR48uTJv5ANB+bVr7Dga2xs/AkTV1JS+gq0AJyoQIkPWU9aWtoPkPibN2/2A/l6QCwJ9TULQADB4hcY//xKXl5eHt++fbsAUmxhYYHiM1DiAsr9R7ZcVVUVbikIdHd3/0TWIyws/AWYVsByAgICdkAxRSAWAGI2gACClV7C4uLiOv7+/lEgRZ8+ffqLLd6ABck3ZMuB6uCWrlu37je29HDx4kVwQisvL88FFqkaQDERUHADBBAomBl5eHiYgQmLE1hSgQQZgIUD1lJm69atf4HR8R1YKoH5QIPAWWP9+vV/gOI/gHkeQw+wGAXTwAJJ5t+/f/BUDRBA4NIEKMDMyMjICtQIiniG379/4yza7t69+//Lly8oDrty5co/bJaCAEwcZCkwwTJDLWYCCCCwxcDgY3z16hXDnTt3voP4EhISWA0BFgZMwNqHExh3jMiG1tbWsgHjnA2bHmAeBtdWwOL1MycnJ7wAAQggBmi+kgIW/OaKiorJwOLuFShO0LMSMPF9AUYBSpz6+vqixHlOTs4P9MIEWHaDsxSwYMoE2mEGFJcG5SKAAGJCqjv/AbPUn8ePH98ACQQHB6NUmZqamkzABIgSp5s3bwbHORCA1QDLAWZkPc7OzszA8oHl5cuXVy5duvQBGIXwWgoggGA+FgO6xkBNTS28r69vDrT2+Y1cIMDyJchX6KkXVEmAshd6KB06dAic94EO3AzkBwGxPhCLg8ptgACCZyeQp9jZ2b2AmsuAefM8tnxJCk5ISPgOLTKfAdNEOVDMA2QHLDsBBBC8AAFlbmCLwlZISCg5JSVlJizeQAaQaimoWAUFK0g/sGGwHiiWCMS2yAUIQAAxI7c4gEmeFZi4OJ48ecLMzc39CRiEmgEBASxA/QzA8vYvAxEgNjaWZc2aNezAsprp2LFjp4FpZRdQ+AkQvwLij0AMSoC/AQIIXklAC3AVUBoBxmE8sPXQAiyvN8J8fuPGjR/h4eHf0eMdhkENhOPHj8OT+NGjR88BxZuBOA5kJtRseCUBEECMSI0AdmgBDooDaaDl8sASTSkyMlKzpqZGU1paGlS7MABLrX83b978A6zwwakTmE0YgIkSnHpBfGCV+gxYh98qKSk5CeTeAxVeQPwUiN8AMSjxgdLNX4AAYkRqCLBAXcMHtVwSaLkMMMHJAvOq9IQJE9R8fHxElJWV1bEF8aNHj+7t27fvLTDlXwXGLyhoH0OD+DnU0k/QYAa1QP8BBBAjWsuSFWo5LzRYxKFYAljqiAHzqxCwIBEwMTERBdZeoOYMA7Bl+RFYEbwB5oS3IA9D4/IFEL+E4nfQ6IDFLTgvAwQQI5ZmLRtSsINSuyA0uwlBUyQPMPWD20/AKo8ByP4DTJTfgRgUjB+gFoEc8R6amGDB+wu5mQsQQIxYmrdMUJ+zQTM6NzQEeKGO4UJqOzFADQMZ/A1qCSzBfQXi71ALfyM17sEAIIAY8fQiWKAYFgIwzIbWTv4HjbdfUAf8RPLhH1icojfoAQKIEU8bG9kRyF0aRiz6YP0k5C4LsmUY9TtAADEyEA+IVfufGEUAAQYABejinPr4dLEAAAAASUVORK5CYII=") no-repeat 0 0; -} - -.modal-spinner { - display: none; - width: 64px; - height: 64px; - position: fixed; - top: 50%; - left: 50%; - margin-right: -32px; - margin-top: -32px; - background: url("data:image/gif;base64,R0lGODlhIAAgAPMAABEREf///0VFRYKCglRUVG5ubsvLy62trTQ0NCkpKU5OTuLi4vr6+gAAAAAAAAAAACH+GkNyZWF0ZWQgd2l0aCBhamF4bG9hZC5pbmZvACH5BAAKAAAAIf8LTkVUU0NBUEUyLjADAQAAACwAAAAAIAAgAAAE5xDISWlhperN52JLhSSdRgwVo1ICQZRUsiwHpTJT4iowNS8vyW2icCF6k8HMMBkCEDskxTBDAZwuAkkqIfxIQyhBQBFvAQSDITM5VDW6XNE4KagNh6Bgwe60smQUB3d4Rz1ZBApnFASDd0hihh12BkE9kjAJVlycXIg7CQIFA6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YJvpJivxNaGmLHT0VnOgSYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHRLYKhKP1oZmADdEAAAh+QQACgABACwAAAAAIAAgAAAE6hDISWlZpOrNp1lGNRSdRpDUolIGw5RUYhhHukqFu8DsrEyqnWThGvAmhVlteBvojpTDDBUEIFwMFBRAmBkSgOrBFZogCASwBDEY/CZSg7GSE0gSCjQBMVG023xWBhklAnoEdhQEfyNqMIcKjhRsjEdnezB+A4k8gTwJhFuiW4dokXiloUepBAp5qaKpp6+Ho7aWW54wl7obvEe0kRuoplCGepwSx2jJvqHEmGt6whJpGpfJCHmOoNHKaHx61WiSR92E4lbFoq+B6QDtuetcaBPnW6+O7wDHpIiK9SaVK5GgV543tzjgGcghAgAh+QQACgACACwAAAAAIAAgAAAE7hDISSkxpOrN5zFHNWRdhSiVoVLHspRUMoyUakyEe8PTPCATW9A14E0UvuAKMNAZKYUZCiBMuBakSQKG8G2FzUWox2AUtAQFcBKlVQoLgQReZhQlCIJesQXI5B0CBnUMOxMCenoCfTCEWBsJColTMANldx15BGs8B5wlCZ9Po6OJkwmRpnqkqnuSrayqfKmqpLajoiW5HJq7FL1Gr2mMMcKUMIiJgIemy7xZtJsTmsM4xHiKv5KMCXqfyUCJEonXPN2rAOIAmsfB3uPoAK++G+w48edZPK+M6hLJpQg484enXIdQFSS1u6UhksENEQAAIfkEAAoAAwAsAAAAACAAIAAABOcQyEmpGKLqzWcZRVUQnZYg1aBSh2GUVEIQ2aQOE+G+cD4ntpWkZQj1JIiZIogDFFyHI0UxQwFugMSOFIPJftfVAEoZLBbcLEFhlQiqGp1Vd140AUklUN3eCA51C1EWMzMCezCBBmkxVIVHBWd3HHl9JQOIJSdSnJ0TDKChCwUJjoWMPaGqDKannasMo6WnM562R5YluZRwur0wpgqZE7NKUm+FNRPIhjBJxKZteWuIBMN4zRMIVIhffcgojwCF117i4nlLnY5ztRLsnOk+aV+oJY7V7m76PdkS4trKcdg0Zc0tTcKkRAAAIfkEAAoABAAsAAAAACAAIAAABO4QyEkpKqjqzScpRaVkXZWQEximw1BSCUEIlDohrft6cpKCk5xid5MNJTaAIkekKGQkWyKHkvhKsR7ARmitkAYDYRIbUQRQjWBwJRzChi9CRlBcY1UN4g0/VNB0AlcvcAYHRyZPdEQFYV8ccwR5HWxEJ02YmRMLnJ1xCYp0Y5idpQuhopmmC2KgojKasUQDk5BNAwwMOh2RtRq5uQuPZKGIJQIGwAwGf6I0JXMpC8C7kXWDBINFMxS4DKMAWVWAGYsAdNqW5uaRxkSKJOZKaU3tPOBZ4DuK2LATgJhkPJMgTwKCdFjyPHEnKxFCDhEAACH5BAAKAAUALAAAAAAgACAAAATzEMhJaVKp6s2nIkolIJ2WkBShpkVRWqqQrhLSEu9MZJKK9y1ZrqYK9WiClmvoUaF8gIQSNeF1Er4MNFn4SRSDARWroAIETg1iVwuHjYB1kYc1mwruwXKC9gmsJXliGxc+XiUCby9ydh1sOSdMkpMTBpaXBzsfhoc5l58Gm5yToAaZhaOUqjkDgCWNHAULCwOLaTmzswadEqggQwgHuQsHIoZCHQMMQgQGubVEcxOPFAcMDAYUA85eWARmfSRQCdcMe0zeP1AAygwLlJtPNAAL19DARdPzBOWSm1brJBi45soRAWQAAkrQIykShQ9wVhHCwCQCACH5BAAKAAYALAAAAAAgACAAAATrEMhJaVKp6s2nIkqFZF2VIBWhUsJaTokqUCoBq+E71SRQeyqUToLA7VxF0JDyIQh/MVVPMt1ECZlfcjZJ9mIKoaTl1MRIl5o4CUKXOwmyrCInCKqcWtvadL2SYhyASyNDJ0uIiRMDjI0Fd30/iI2UA5GSS5UDj2l6NoqgOgN4gksEBgYFf0FDqKgHnyZ9OX8HrgYHdHpcHQULXAS2qKpENRg7eAMLC7kTBaixUYFkKAzWAAnLC7FLVxLWDBLKCwaKTULgEwbLA4hJtOkSBNqITT3xEgfLpBtzE/jiuL04RGEBgwWhShRgQExHBAAh+QQACgAHACwAAAAAIAAgAAAE7xDISWlSqerNpyJKhWRdlSAVoVLCWk6JKlAqAavhO9UkUHsqlE6CwO1cRdCQ8iEIfzFVTzLdRAmZX3I2SfZiCqGk5dTESJeaOAlClzsJsqwiJwiqnFrb2nS9kmIcgEsjQydLiIlHehhpejaIjzh9eomSjZR+ipslWIRLAgMDOR2DOqKogTB9pCUJBagDBXR6XB0EBkIIsaRsGGMMAxoDBgYHTKJiUYEGDAzHC9EACcUGkIgFzgwZ0QsSBcXHiQvOwgDdEwfFs0sDzt4S6BK4xYjkDOzn0unFeBzOBijIm1Dgmg5YFQwsCMjp1oJ8LyIAACH5BAAKAAgALAAAAAAgACAAAATwEMhJaVKp6s2nIkqFZF2VIBWhUsJaTokqUCoBq+E71SRQeyqUToLA7VxF0JDyIQh/MVVPMt1ECZlfcjZJ9mIKoaTl1MRIl5o4CUKXOwmyrCInCKqcWtvadL2SYhyASyNDJ0uIiUd6GGl6NoiPOH16iZKNlH6KmyWFOggHhEEvAwwMA0N9GBsEC6amhnVcEwavDAazGwIDaH1ipaYLBUTCGgQDA8NdHz0FpqgTBwsLqAbWAAnIA4FWKdMLGdYGEgraigbT0OITBcg5QwPT4xLrROZL6AuQAPUS7bxLpoWidY0JtxLHKhwwMJBTHgPKdEQAACH5BAAKAAkALAAAAAAgACAAAATrEMhJaVKp6s2nIkqFZF2VIBWhUsJaTokqUCoBq+E71SRQeyqUToLA7VxF0JDyIQh/MVVPMt1ECZlfcjZJ9mIKoaTl1MRIl5o4CUKXOwmyrCInCKqcWtvadL2SYhyASyNDJ0uIiUd6GAULDJCRiXo1CpGXDJOUjY+Yip9DhToJA4RBLwMLCwVDfRgbBAaqqoZ1XBMHswsHtxtFaH1iqaoGNgAIxRpbFAgfPQSqpbgGBqUD1wBXeCYp1AYZ19JJOYgH1KwA4UBvQwXUBxPqVD9L3sbp2BNk2xvvFPJd+MFCN6HAAIKgNggY0KtEBAAh+QQACgAKACwAAAAAIAAgAAAE6BDISWlSqerNpyJKhWRdlSAVoVLCWk6JKlAqAavhO9UkUHsqlE6CwO1cRdCQ8iEIfzFVTzLdRAmZX3I2SfYIDMaAFdTESJeaEDAIMxYFqrOUaNW4E4ObYcCXaiBVEgULe0NJaxxtYksjh2NLkZISgDgJhHthkpU4mW6blRiYmZOlh4JWkDqILwUGBnE6TYEbCgevr0N1gH4At7gHiRpFaLNrrq8HNgAJA70AWxQIH1+vsYMDAzZQPC9VCNkDWUhGkuE5PxJNwiUK4UfLzOlD4WvzAHaoG9nxPi5d+jYUqfAhhykOFwJWiAAAIfkEAAoACwAsAAAAACAAIAAABPAQyElpUqnqzaciSoVkXVUMFaFSwlpOCcMYlErAavhOMnNLNo8KsZsMZItJEIDIFSkLGQoQTNhIsFehRww2CQLKF0tYGKYSg+ygsZIuNqJksKgbfgIGepNo2cIUB3V1B3IvNiBYNQaDSTtfhhx0CwVPI0UJe0+bm4g5VgcGoqOcnjmjqDSdnhgEoamcsZuXO1aWQy8KAwOAuTYYGwi7w5h+Kr0SJ8MFihpNbx+4Erq7BYBuzsdiH1jCAzoSfl0rVirNbRXlBBlLX+BP0XJLAPGzTkAuAOqb0WT5AH7OcdCm5B8TgRwSRKIHQtaLCwg1RAAAOwAAAAAAAAAAAA==") #111 no-repeat center center; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - -o-border-radius: 8px; - -ms-border-radius: 8px; - border-radius: 8px; -} - -.metricCategories { - overflow: hidden; - } - -.metricCategories li{ - width: 150px; - margin: 0 5px; - text-align: center; - display: inline-block; - } - -.metricCategories h6 { - font-size: 12px; -} - -.pagination li {display: inline-block; margin-bottom: 10px; margin-right: 2px;} -.pagination li a { - display: block; - text-decoration: none; - border: 1px solid #b1def2; - padding: 3px 6px; - border-radius: 2px; - font-size: 14px; - } - - - - - -.cert-box {overflow: auto;} - -h1{ - width: 60%;} -.margin-right-button{ - margin-right: 6px;} -.grant-name{ - color: #0d89b0; - font-size: 16px; - /*font-family: 'roboto_condensedbold';*/ - width:59%; - float: left;} -.grant-stat{ - float:left; - width: 20%; - margin-right: 10px; - position: relative; - -} - -.grant-stat span { - border: 1px solid #cccbcb; - padding: 4px 5px; - border-radius: 4px; - } - - -.cert-box .small-button{ - position: relative; - top: -5px;} -.grant-time{ - float: right;} - -/*.grant-detail {float:right;}*/ - -.grant-details { - /*font-family: 'roboto_condensedbold';*/ -} - -/*--15.02--*/ -strong{ - font-family: 'roboto_condensedbold'; } -.right-section header p.text-columns{ - float: left; - margin-top: 8px; - width: 46%; - margin-right: 2%;} -.content-section header p.text-columns{ - float: left; - margin-top: 8px; - width: 46%; - margin-right: 2%;} - - -h1 .site-name { - font-size: 14px; - padding: 5px; - color: #fff; - font-weight: bold; - background: #333333; - border-radius: 5px; - text-transform: uppercase; - margin-top: 10px; - margin-left: 10px; -} - -h1 span {float: left;} - -.grant-name .site-name { - font-size: 12px; - padding: 3px; - color: #fff; - font-weight: bold; - background: #333333; - border-radius: 5px; - text-transform: uppercase; - margin-top: -4px; - margin-left: 10px; - opacity: 0.6; -} - - -.grant-box{ - border-left: 1px solid #f2f2f2; - border-right: 1px solid #f2f2f2; - border-bottom: 1px solid #d9d9d9; - box-shadow: 1px 1px #f2f2f2; - margin-bottom: 20px; - padding: 10px; - padding-bottom: 20px; - position: relative; - line-height: 120%;} -.grant-box h3{ - margin-top: 0px; - border-bottom: none; - margin-bottom: 10px; -} -.grant-box .hint{ - float: right; - width: auto; - color: #687378;} -.width40{ - width: 42%;} -.width60{ - width: 60%;} -.width80{ - width: 86.5%;} -.border-dashed{ - border-right: 1px dashed #e1e0e0; - margin-right: 20px;} -.services-title{ - margin-bottom: 20px; - display: inline-block;} -ul#double{ - width:360px; - margin-bottom:20px; - overflow:hidden; - list-style:disc;} -#double li { width:40%; - float:left; - list-style:disc; - margin-left: 20px; - padding-left: 10px; -} - - -.button-cell .button{ - position: relative; - top: 15px; - margin-right: 13px;} - -.grant-test li{ - width: 23%; - margin-right:2%; - float: left;} -.grant-test li ul li{ - width: 100%;} -.grant-test li ul li span{ - display: inline-block; - width: 45%; - margin-right: 3%;} -.grant-test li ul li span.width100{ - width: 100%;} -.grant-test p{ - padding-bottom:6px; - margin-bottom: 7px; - border-bottom: 1px dashed #e1e0e0;} -.grant-test p .fa{ - margin-right: 10px; - opacity: 0.8;} - - -.metricCategories li:hover { - cursor: pointer; - cursor: hand; -} - -@font-face { - font-family: 'Glyphicons Halflings'; - - src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); -} -.glyphicon { - position: relative; - top: 1px; - display: inline-block; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - line-height: 1; - - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.glyphicon-asterisk:before { - content: "\002a"; -} -.glyphicon-plus:before { - content: "\002b"; -} -.glyphicon-euro:before, -.glyphicon-eur:before { - content: "\20ac"; -} -.glyphicon-minus:before { - content: "\2212"; -} -.glyphicon-cloud:before { - content: "\2601"; -} -.glyphicon-envelope:before { - content: "\2709"; -} -.glyphicon-pencil:before { - content: "\270f"; -} -.glyphicon-glass:before { - content: "\e001"; -} -.glyphicon-music:before { - content: "\e002"; -} -.glyphicon-search:before { - content: "\e003"; -} -.glyphicon-heart:before { - content: "\e005"; -} -.glyphicon-star:before { - content: "\e006"; -} -.glyphicon-star-empty:before { - content: "\e007"; -} -.glyphicon-user:before { - content: "\e008"; -} -.glyphicon-film:before { - content: "\e009"; -} -.glyphicon-th-large:before { - content: "\e010"; -} -.glyphicon-th:before { - content: "\e011"; -} -.glyphicon-th-list:before { - content: "\e012"; -} -.glyphicon-ok:before { - content: "\e013"; -} -.glyphicon-remove:before { - content: "\e014"; -} -.glyphicon-zoom-in:before { - content: "\e015"; -} -.glyphicon-zoom-out:before { - content: "\e016"; -} -.glyphicon-off:before { - content: "\e017"; -} -.glyphicon-signal:before { - content: "\e018"; -} -.glyphicon-cog:before { - content: "\e019"; -} -.glyphicon-trash:before { - content: "\e020"; -} -.glyphicon-home:before { - content: "\e021"; -} -.glyphicon-file:before { - content: "\e022"; -} -.glyphicon-time:before { - content: "\e023"; -} -.glyphicon-road:before { - content: "\e024"; -} -.glyphicon-download-alt:before { - content: "\e025"; -} -.glyphicon-download:before { - content: "\e026"; -} -.glyphicon-upload:before { - content: "\e027"; -} -.glyphicon-inbox:before { - content: "\e028"; -} -.glyphicon-play-circle:before { - content: "\e029"; -} -.glyphicon-repeat:before { - content: "\e030"; -} -.glyphicon-refresh:before { - content: "\e031"; -} -.glyphicon-list-alt:before { - content: "\e032"; -} -.glyphicon-lock:before { - content: "\e033"; -} -.glyphicon-flag:before { - content: "\e034"; -} -.glyphicon-headphones:before { - content: "\e035"; -} -.glyphicon-volume-off:before { - content: "\e036"; -} -.glyphicon-volume-down:before { - content: "\e037"; -} -.glyphicon-volume-up:before { - content: "\e038"; -} -.glyphicon-qrcode:before { - content: "\e039"; -} -.glyphicon-barcode:before { - content: "\e040"; -} -.glyphicon-tag:before { - content: "\e041"; -} -.glyphicon-tags:before { - content: "\e042"; -} -.glyphicon-book:before { - content: "\e043"; -} -.glyphicon-bookmark:before { - content: "\e044"; -} -.glyphicon-print:before { - content: "\e045"; -} -.glyphicon-camera:before { - content: "\e046"; -} -.glyphicon-font:before { - content: "\e047"; -} -.glyphicon-bold:before { - content: "\e048"; -} -.glyphicon-italic:before { - content: "\e049"; -} -.glyphicon-text-height:before { - content: "\e050"; -} -.glyphicon-text-width:before { - content: "\e051"; -} -.glyphicon-align-left:before { - content: "\e052"; -} -.glyphicon-align-center:before { - content: "\e053"; -} -.glyphicon-align-right:before { - content: "\e054"; -} -.glyphicon-align-justify:before { - content: "\e055"; -} -.glyphicon-list:before { - content: "\e056"; -} -.glyphicon-indent-left:before { - content: "\e057"; -} -.glyphicon-indent-right:before { - content: "\e058"; -} -.glyphicon-facetime-video:before { - content: "\e059"; -} -.glyphicon-picture:before { - content: "\e060"; -} -.glyphicon-map-marker:before { - content: "\e062"; -} -.glyphicon-adjust:before { - content: "\e063"; -} -.glyphicon-tint:before { - content: "\e064"; -} -.glyphicon-edit:before { - content: "\e065"; -} -.glyphicon-share:before { - content: "\e066"; -} -.glyphicon-check:before { - content: "\e067"; -} -.glyphicon-move:before { - content: "\e068"; -} -.glyphicon-step-backward:before { - content: "\e069"; -} -.glyphicon-fast-backward:before { - content: "\e070"; -} -.glyphicon-backward:before { - content: "\e071"; -} -.glyphicon-play:before { - content: "\e072"; -} -.glyphicon-pause:before { - content: "\e073"; -} -.glyphicon-stop:before { - content: "\e074"; -} -.glyphicon-forward:before { - content: "\e075"; -} -.glyphicon-fast-forward:before { - content: "\e076"; -} -.glyphicon-step-forward:before { - content: "\e077"; -} -.glyphicon-eject:before { - content: "\e078"; -} -.glyphicon-chevron-left:before { - content: "\e079"; -} -.glyphicon-chevron-right:before { - content: "\e080"; -} -.glyphicon-plus-sign:before { - content: "\e081"; -} -.glyphicon-minus-sign:before { - content: "\e082"; -} -.glyphicon-remove-sign:before { - content: "\e083"; -} -.glyphicon-ok-sign:before { - content: "\e084"; -} -.glyphicon-question-sign:before { - content: "\e085"; -} -.glyphicon-info-sign:before { - content: "\e086"; -} -.glyphicon-screenshot:before { - content: "\e087"; -} -.glyphicon-remove-circle:before { - content: "\e088"; -} -.glyphicon-ok-circle:before { - content: "\e089"; -} -.glyphicon-ban-circle:before { - content: "\e090"; -} -.glyphicon-arrow-left:before { - content: "\e091"; -} -.glyphicon-arrow-right:before { - content: "\e092"; -} -.glyphicon-arrow-up:before { - content: "\e093"; -} -.glyphicon-arrow-down:before { - content: "\e094"; -} -.glyphicon-share-alt:before { - content: "\e095"; -} -.glyphicon-resize-full:before { - content: "\e096"; -} -.glyphicon-resize-small:before { - content: "\e097"; -} -.glyphicon-exclamation-sign:before { - content: "\e101"; -} -.glyphicon-gift:before { - content: "\e102"; -} -.glyphicon-leaf:before { - content: "\e103"; -} -.glyphicon-fire:before { - content: "\e104"; -} -.glyphicon-eye-open:before { - content: "\e105"; -} -.glyphicon-eye-close:before { - content: "\e106"; -} -.glyphicon-warning-sign:before { - content: "\e107"; -} -.glyphicon-plane:before { - content: "\e108"; -} -.glyphicon-calendar:before { - content: "\e109"; -} -.glyphicon-random:before { - content: "\e110"; -} -.glyphicon-comment:before { - content: "\e111"; -} -.glyphicon-magnet:before { - content: "\e112"; -} -.glyphicon-chevron-up:before { - content: "\e113"; -} -.glyphicon-chevron-down:before { - content: "\e114"; -} -.glyphicon-retweet:before { - content: "\e115"; -} -.glyphicon-shopping-cart:before { - content: "\e116"; -} -.glyphicon-folder-close:before { - content: "\e117"; -} -.glyphicon-folder-open:before { - content: "\e118"; -} -.glyphicon-resize-vertical:before { - content: "\e119"; -} -.glyphicon-resize-horizontal:before { - content: "\e120"; -} -.glyphicon-hdd:before { - content: "\e121"; -} -.glyphicon-bullhorn:before { - content: "\e122"; -} -.glyphicon-bell:before { - content: "\e123"; -} -.glyphicon-certificate:before { - content: "\e124"; -} -.glyphicon-thumbs-up:before { - content: "\e125"; -} -.glyphicon-thumbs-down:before { - content: "\e126"; -} -.glyphicon-hand-right:before { - content: "\e127"; -} -.glyphicon-hand-left:before { - content: "\e128"; -} -.glyphicon-hand-up:before { - content: "\e129"; -} -.glyphicon-hand-down:before { - content: "\e130"; -} -.glyphicon-circle-arrow-right:before { - content: "\e131"; -} -.glyphicon-circle-arrow-left:before { - content: "\e132"; -} -.glyphicon-circle-arrow-up:before { - content: "\e133"; -} -.glyphicon-circle-arrow-down:before { - content: "\e134"; -} -.glyphicon-globe:before { - content: "\e135"; -} -.glyphicon-wrench:before { - content: "\e136"; -} -.glyphicon-tasks:before { - content: "\e137"; -} -.glyphicon-filter:before { - content: "\e138"; -} -.glyphicon-briefcase:before { - content: "\e139"; -} -.glyphicon-fullscreen:before { - content: "\e140"; -} -.glyphicon-dashboard:before { - content: "\e141"; -} -.glyphicon-paperclip:before { - content: "\e142"; -} -.glyphicon-heart-empty:before { - content: "\e143"; -} -.glyphicon-link:before { - content: "\e144"; -} -.glyphicon-phone:before { - content: "\e145"; -} -.glyphicon-pushpin:before { - content: "\e146"; -} -.glyphicon-usd:before { - content: "\e148"; -} -.glyphicon-gbp:before { - content: "\e149"; -} -.glyphicon-sort:before { - content: "\e150"; -} -.glyphicon-sort-by-alphabet:before { - content: "\e151"; -} -.glyphicon-sort-by-alphabet-alt:before { - content: "\e152"; -} -.glyphicon-sort-by-order:before { - content: "\e153"; -} -.glyphicon-sort-by-order-alt:before { - content: "\e154"; -} -.glyphicon-sort-by-attributes:before { - content: "\e155"; -} -.glyphicon-sort-by-attributes-alt:before { - content: "\e156"; -} -.glyphicon-unchecked:before { - content: "\e157"; -} -.glyphicon-expand:before { - content: "\e158"; -} -.glyphicon-collapse-down:before { - content: "\e159"; -} -.glyphicon-collapse-up:before { - content: "\e160"; -} -.glyphicon-log-in:before { - content: "\e161"; -} -.glyphicon-flash:before { - content: "\e162"; -} -.glyphicon-log-out:before { - content: "\e163"; -} -.glyphicon-new-window:before { - content: "\e164"; -} -.glyphicon-record:before { - content: "\e165"; -} -.glyphicon-save:before { - content: "\e166"; -} -.glyphicon-open:before { - content: "\e167"; -} -.glyphicon-saved:before { - content: "\e168"; -} -.glyphicon-import:before { - content: "\e169"; -} -.glyphicon-export:before { - content: "\e170"; -} -.glyphicon-send:before { - content: "\e171"; -} -.glyphicon-floppy-disk:before { - content: "\e172"; -} -.glyphicon-floppy-saved:before { - content: "\e173"; -} -.glyphicon-floppy-remove:before { - content: "\e174"; -} -.glyphicon-floppy-save:before { - content: "\e175"; -} -.glyphicon-floppy-open:before { - content: "\e176"; -} -.glyphicon-credit-card:before { - content: "\e177"; -} -.glyphicon-transfer:before { - content: "\e178"; -} -.glyphicon-cutlery:before { - content: "\e179"; -} -.glyphicon-header:before { - content: "\e180"; -} -.glyphicon-compressed:before { - content: "\e181"; -} -.glyphicon-earphone:before { - content: "\e182"; -} -.glyphicon-phone-alt:before { - content: "\e183"; -} -.glyphicon-tower:before { - content: "\e184"; -} -.glyphicon-stats:before { - content: "\e185"; -} -.glyphicon-sd-video:before { - content: "\e186"; -} -.glyphicon-hd-video:before { - content: "\e187"; -} -.glyphicon-subtitles:before { - content: "\e188"; -} -.glyphicon-sound-stereo:before { - content: "\e189"; -} -.glyphicon-sound-dolby:before { - content: "\e190"; -} -.glyphicon-sound-5-1:before { - content: "\e191"; -} -.glyphicon-sound-6-1:before { - content: "\e192"; -} -.glyphicon-sound-7-1:before { - content: "\e193"; -} -.glyphicon-copyright-mark:before { - content: "\e194"; -} -.glyphicon-registration-mark:before { - content: "\e195"; -} -.glyphicon-cloud-download:before { - content: "\e197"; -} -.glyphicon-cloud-upload:before { - content: "\e198"; -} -.glyphicon-tree-conifer:before { - content: "\e199"; -} -.glyphicon-tree-deciduous:before { - content: "\e200"; -} -.glyphicon-cd:before { - content: "\e201"; -} -.glyphicon-save-file:before { - content: "\e202"; -} -.glyphicon-open-file:before { - content: "\e203"; -} -.glyphicon-level-up:before { - content: "\e204"; -} -.glyphicon-copy:before { - content: "\e205"; -} -.glyphicon-paste:before { - content: "\e206"; -} -.glyphicon-alert:before { - content: "\e209"; -} -.glyphicon-equalizer:before { - content: "\e210"; -} -.glyphicon-king:before { - content: "\e211"; -} -.glyphicon-queen:before { - content: "\e212"; -} -.glyphicon-pawn:before { - content: "\e213"; -} -.glyphicon-bishop:before { - content: "\e214"; -} -.glyphicon-knight:before { - content: "\e215"; -} -.glyphicon-baby-formula:before { - content: "\e216"; -} -.glyphicon-tent:before { - content: "\26fa"; -} -.glyphicon-blackboard:before { - content: "\e218"; -} -.glyphicon-bed:before { - content: "\e219"; -} -.glyphicon-apple:before { - content: "\f8ff"; -} -.glyphicon-erase:before { - content: "\e221"; -} -.glyphicon-hourglass:before { - content: "\231b"; -} -.glyphicon-lamp:before { - content: "\e223"; -} -.glyphicon-duplicate:before { - content: "\e224"; -} -.glyphicon-piggy-bank:before { - content: "\e225"; -} -.glyphicon-scissors:before { - content: "\e226"; -} -.glyphicon-bitcoin:before { - content: "\e227"; -} -.glyphicon-btc:before { - content: "\e227"; -} -.glyphicon-xbt:before { - content: "\e227"; -} -.glyphicon-yen:before { - content: "\00a5"; -} -.glyphicon-jpy:before { - content: "\00a5"; -} -.glyphicon-ruble:before { - content: "\20bd"; -} -.glyphicon-rub:before { - content: "\20bd"; -} -.glyphicon-scale:before { - content: "\e230"; -} -.glyphicon-ice-lolly:before { - content: "\e231"; -} -.glyphicon-ice-lolly-tasted:before { - content: "\e232"; -} -.glyphicon-education:before { - content: "\e233"; -} -.glyphicon-option-horizontal:before { - content: "\e234"; -} -.glyphicon-option-vertical:before { - content: "\e235"; -} -.glyphicon-menu-hamburger:before { - content: "\e236"; -} -.glyphicon-modal-window:before { - content: "\e237"; -} -.glyphicon-oil:before { - content: "\e238"; -} -.glyphicon-grain:before { - content: "\e239"; -} -.glyphicon-sunglasses:before { - content: "\e240"; -} -.glyphicon-text-size:before { - content: "\e241"; -} -.glyphicon-text-color:before { - content: "\e242"; -} -.glyphicon-text-background:before { - content: "\e243"; -} -.glyphicon-object-align-top:before { - content: "\e244"; -} -.glyphicon-object-align-bottom:before { - content: "\e245"; -} -.glyphicon-object-align-horizontal:before { - content: "\e246"; -} -.glyphicon-object-align-left:before { - content: "\e247"; -} -.glyphicon-object-align-vertical:before { - content: "\e248"; -} -.glyphicon-object-align-right:before { - content: "\e249"; -} -.glyphicon-triangle-right:before { - content: "\e250"; -} -.glyphicon-triangle-left:before { - content: "\e251"; -} -.glyphicon-triangle-bottom:before { - content: "\e252"; -} -.glyphicon-triangle-top:before { - content: "\e253"; -} -.glyphicon-console:before { - content: "\e254"; -} -.glyphicon-superscript:before { - content: "\e255"; -} -.glyphicon-subscript:before { - content: "\e256"; -} -.glyphicon-menu-left:before { - content: "\e257"; -} -.glyphicon-menu-right:before { - content: "\e258"; -} -.glyphicon-menu-down:before { - content: "\e259"; -} -.glyphicon-menu-up:before { - content: "\e260"; -} - - - -/* Absolute Center Spinner */ -.loading { - position: fixed; - z-index: 999; - height: 2em; - width: 2em; - overflow: show; - margin: auto; - top: 0; - left: 0; - bottom: 0; - right: 0; -} - -/* Transparent Overlay */ -.loading:before { - content: ''; - display: block; - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(0,0,0,0.5); -} - -/* :not(:required) hides these rules from IE9 and below */ -.loading:not(:required) { - /* hide "loading..." text */ - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.loading:not(:required):after { - content: ''; - display: block; - font-size: 10px; - width: 1em; - height: 1em; - margin-top: -0.5em; - -webkit-animation: spinner 1500ms infinite linear; - -moz-animation: spinner 1500ms infinite linear; - -ms-animation: spinner 1500ms infinite linear; - -o-animation: spinner 1500ms infinite linear; - animation: spinner 1500ms infinite linear; - border-radius: 0.5em; - -webkit-box-shadow: rgba(0, 0, 0, 0.75) 1.5em 0 0 0, rgba(0, 0, 0, 0.75) 1.1em 1.1em 0 0, rgba(0, 0, 0, 0.75) 0 1.5em 0 0, rgba(0, 0, 0, 0.75) -1.1em 1.1em 0 0, rgba(0, 0, 0, 0.5) -1.5em 0 0 0, rgba(0, 0, 0, 0.5) -1.1em -1.1em 0 0, rgba(0, 0, 0, 0.75) 0 -1.5em 0 0, rgba(0, 0, 0, 0.75) 1.1em -1.1em 0 0; - box-shadow: rgba(0, 0, 0, 0.75) 1.5em 0 0 0, rgba(0, 0, 0, 0.75) 1.1em 1.1em 0 0, rgba(0, 0, 0, 0.75) 0 1.5em 0 0, rgba(0, 0, 0, 0.75) -1.1em 1.1em 0 0, rgba(0, 0, 0, 0.75) -1.5em 0 0 0, rgba(0, 0, 0, 0.75) -1.1em -1.1em 0 0, rgba(0, 0, 0, 0.75) 0 -1.5em 0 0, rgba(0, 0, 0, 0.75) 1.1em -1.1em 0 0; -} - -/* Animation */ - -@-webkit-keyframes spinner { - 0% { - -webkit-transform: rotate(0deg); - -moz-transform: rotate(0deg); - -ms-transform: rotate(0deg); - -o-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - -moz-transform: rotate(360deg); - -ms-transform: rotate(360deg); - -o-transform: rotate(360deg); - transform: rotate(360deg); - } -} -@-moz-keyframes spinner { - 0% { - -webkit-transform: rotate(0deg); - -moz-transform: rotate(0deg); - -ms-transform: rotate(0deg); - -o-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - -moz-transform: rotate(360deg); - -ms-transform: rotate(360deg); - -o-transform: rotate(360deg); - transform: rotate(360deg); - } -} -@-o-keyframes spinner { - 0% { - -webkit-transform: rotate(0deg); - -moz-transform: rotate(0deg); - -ms-transform: rotate(0deg); - -o-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - -moz-transform: rotate(360deg); - -ms-transform: rotate(360deg); - -o-transform: rotate(360deg); - transform: rotate(360deg); - } -} -@keyframes spinner { - 0% { - -webkit-transform: rotate(0deg); - -moz-transform: rotate(0deg); - -ms-transform: rotate(0deg); - -o-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - -moz-transform: rotate(360deg); - -ms-transform: rotate(360deg); - -o-transform: rotate(360deg); - transform: rotate(360deg); - } -} - - - -.loader, .loginWait { - background: url(../images/loading.gif) no-repeat center; - height: 32px; - padding: 15px; - border-radius: 2px; -} - -.loginWait { - text-align: center; -} - - -/* modal categories */ - -.metricCategories li span, -.metricCategories li.active span{ - width: 142px; - height: 142px; - display: block; - background: url(../img/grant_ico1.png); -} - -.metricCategories li.documentation span {background: url(../img/grant_ico1.png);} -.metricCategories li.computing span{background: url(../img/grant_ico3.png);} -.metricCategories li.storage span{background: url(../img/grant_ico4.png);} -.metricCategories li.cloud span {background: url(../img/grant_ico2.png);} - -.metricCategories li.documentation.active span {background: url(../img/grant_ico1-act.png);} -.metricCategories li.computing.active span{background: url(../img/grant_ico3-act.png);} -.metricCategories li.storage.active span{background: url(../img/grant_ico4-act.png);} -.metricCategories li.cloud.active span {background: url(../img/grant_ico2-act.png);} - -.intro { - margin-bottom: 10px; - line-height: 1.2 em; - } - - -.errorForm { - display:block; - padding: 5px; - background: #ffcccc; - color: #e85b51; - clear:both; - margin: 5px 0; -} diff --git a/src/main/resources/static/css/ltos.css b/src/main/resources/static/css/ltos.css deleted file mode 100644 index d0f02fa..0000000 --- a/src/main/resources/static/css/ltos.css +++ /dev/null @@ -1,658 +0,0 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,100,100italic,300,300italic,400italic,700,700italic,900,900italic&subset=latin,latin-ext); - -/*! HTML5 Boilerplate v5.2.0 | MIT License | https://html5boilerplate.com/ */ - -/* - * What follows is the result of much research on cross-browser styling. - * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, - * Kroc Camen, and the H5BP dev community and team. - */ - -/* ========================================================================== - Base styles: opinionated defaults - ========================================================================== */ - -html { - color: #222; - font-size: 14px; - line-height: 1.4; - font-family: "Lato", Helvetica, sans-serif; - background: url(../images/bg-panel.jpg) no-repeat fixed top right; - background-size: cover; - -} - - - -/* - * Remove text-shadow in selection highlight: - * https://twitter.com/miketaylr/status/12228805301 - * - * These selection rule sets have to be separate. - * Customize the background color to match your design. - */ - -::-moz-selection { - background: #b3d4fc; - text-shadow: none; -} - -::selection { - background: #b3d4fc; - text-shadow: none; -} - -/* - * A better looking default horizontal rule - */ - -hr { - display: block; - height: 1px; - border: 0; - border-top: 1px solid #ccc; - margin: 1em 0; - padding: 0; -} - -/* - * Remove the gap between audio, canvas, iframes, - * images, videos and the bottom of their containers: - * https://github.com/h5bp/html5-boilerplate/issues/440 - */ - -audio, -canvas, -iframe, -img, -svg, -video { - vertical-align: middle; -} - -/* - * Remove default fieldset styles. - */ - -fieldset, h1,h2,h3,h4,h5,p { - border: 0; - margin: 0; - padding: 0; -} - -/* - * Allow only vertical resizing of textareas. - */ - -textarea { - resize: vertical; -} - -a {text-decoration: none;} - -ul { - display: block; - list-style-type: none; - -webkit-margin-before: 0; - -webkit-margin-after: 0; - -webkit-margin-start: 0; - -webkit-margin-end: 0; - -webkit-padding-start: 0; - margin: 0; - padding: 0; -} -li {margin: 0;} - -/* ========================================================================== - Browser Upgrade Prompt - ========================================================================== */ - -.browserupgrade { - margin: 0.2em 0; - background: #ccc; - color: #000; - padding: 0.2em 0; -} - -/* ========================================================================== - Author's custom styles - ========================================================================== */ - -@font-face { - font-family: 'collatorregular'; - src: url('../fonts/collator-webfont.eot'); - src: url('../fonts/collator-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/collator-webfont.woff2') format('woff2'), - url('../fonts/collator-webfont.woff') format('woff'), - url('../fonts/collator-webfont.ttf') format('truetype'), - url('../fonts/collator-webfont.svg#collatorregular') format('svg'); - font-weight: normal; - font-style: normal; - -} - -header { - background: #003358; - height: 72px; - overflow:hidden; - margin-bottom: 15px; -} - -.content { - width: 1100px; - margin: 0 auto; - color: #565656; -} - -.logo { - background: url(../images/logo-egi-panel.png) no-repeat; - height: 60px; - width: 85px; - outline: none; - text-indent: -9999px; - display:block; - float:left; - margin-top: 6px; -} - -a {color: #0067b1;} -a span {text-decoration: underline} -a span:hover {text-decoration: none;} -a i {margin-right: 8px;} -p {line-height: 1.6;} - -h1 .fa, -h2 .fa { - margin-right: 15px; - color: #dedede; -} - -h1 .btn, h2 .btn { - right: 0; - top: 15px; - background: #f9a134; - position: absolute; -} - -.btn { - display: inline-block; - padding: 6px 10px 2px; 10px; - color: #fff; - text-shadow: 1px 1px 2px #4F4F4F; - text-transform: uppercase; - border-radius: 3px; - font-weight: 800; - border-bottom: 3px solid #dc7e09; - font-family: "lato", verdana, sans-serif; - border: none; - border-bottom: 2px solid #dc7e09; - -} - -.btn .fa {margin-right: 6px; color: #fff !important;} -.btn-sm {font-size: 0.3em;} -.btn-success { - background: #00b411; - border-bottom: 2px solid #0a9b16; - padding: 8px 14px 6px 14px; - } - -.btn-cancel { - background: #f28282; - border-bottom: 2px solid #d64444; - padding: 8px 14px 6px 14px; -} - -a.btn {text-decoration: none;} -a.btn.btn-success:hover {background: #00a40f;} - -nav {float:right;margin-top: 30px;} - -nav li { - display: inline-block; - margin-left: 15px; - color: #67aada; - font-weight: bold; -} - - -nav li:nth-child(5) {margin-left: 55px;} -nav li a { - color: #fff; - padding-bottom: 21px; -} - -nav li.active a, nav li:last-child a, -nav li a:hover{ - border-bottom: 4px solid #f9a134; - color: #f9a134; -} - -nav li a:hover, -nav li:last-child a {border: none;} -nav li:last-child {margin-left: 5px;} - -.box { - background: #fff; - border-radius: 5px; - box-shadow:0 5px 5px #d8d7d7 ; - padding: 20px; -} - -.fright {float:right;} -.fleft {float:left;} - -.grid-1-3 {width: 30%;} -.grid-2-3 {width: 61.5%;} - -.grid-1-3a {width: 37%;} -.grid-2-3a {width: 54%;} - - -h2 { - font-family: 'collatorregular'; - color: #004374; - font-size: 3em; - font-weight: normal; - margin-bottom: 15px; - position: relative; -} - -.tipbox { - border-top: 1px solid #f1f0ef; - margin-top: 20px; - padding-top: 20px; -} - -.tipbox i { - color: #f9a134; - background: #f1f0f0; - padding: 15px; - border-radius: 50%; -} - -.tipbox p {width: 75%;margin-top: 15px;line-height: 1.3;} -.tipbox a { - display:block; - font-weight: bold; - text-decoration: underline; -} - -form ul, -.userprof, .status {list-style:none;} -form ul li, -.userprof li { - background: #ededed; - padding: 12px 10px; - margin-bottom: 2px; - overflow: hidden; -} - -.userprof li {padding: 15px 10px;} - -form ul li:last-child {background: transparent;} - -form.horizontal label, -.userprof span{ - float:left; - width: 100px; - display:block; - vertical-align: middle; - margin: 15px 15px 0 0; - font-size: 1em; -} - -.userprof span {width: 100px;margin: 0 15px 0 0;} - -form.horizontal label.doubleline { - margin-top: 1px; -} - -form.horizontal input, -form.horizontal select { - float:left; - padding: 12px; - width: 250px; -} - -.status li {clear:both;border-top: 1px solid #f1f0ef;} -.status li:first-child {border: none;} - -.status figure { - float: left; - width: 50px; - height: 50px; - background: #f9a134; - border-radius: 50px; - margin-right: 10px; - color: #fff; - text-align: center; - margin-left: 0; - padding-left: 0; - } - -.status figure i {margin-top: 11px;} -.status p {float:left;margin-top: 27px;} -.status p span {font-weight: 300;} -.grid-1 {overflow: hidden;} - -.grid-1 form.horizontal input, -.grid-1 form.horizontal select { - width: 500px; -} - -.grid-1 form.horizontal label { - width: 200px; - margin-top: 13px; -} - -.grid-1 form.horizontal label.doubleline {margin-top: 2px;} - -.grid-2-3 .userprof span {width: 250px;} -.grid-2-3 .userprof li {padding: 12px 10px;} - -form input, -form select, -form textarea -{ - border-radius: 3px; - border: none; - padding: 7px 5px; - -webkit-box-shadow: 1px 1px 1px 0px #b5b5b5; - box-shadow: 1px 1px 2px 0px #b5b5b5; -} - -label span {font-size: 0.8em; text-transform: uppercase; opacity: 0.5;} - - -table {width: 100%;} -table td, table th {vertical-align: middle;padding: 15px 10px; text-align:center;} -table td:first-child, table th:first-child {text-align:left;} -table th { - background: #eeeeee; - font-weight: normal; - font-style: italic; - padding: 10px; -} - -table td {border-bottom: 1px solid #eeeeee;} -table td a {text-decoration: underline;} - -.pull-left {float:left;} -.pull-right {float:right;} - -.table {font-size: 14px;margin-top: 15px;} -.table td {padding: 15px 10px;border-bottom: 1px solid #dedede;} -.table td:first-child {width: 75%;padding-right: 10px;} -.table td:last-child {padding-left: 10px;} - -.breadcrumb { - font-size: 0.9em; - margin-bottom: 20px; - margin-top: 20px; -} - -.breadcrumb li {display: inline-block;margin-right: 5px;} -.breadcrumb li:first-child {color: #6f90a9; font-weight: bold;} -.breadcrumb li a {text-decoration:underline;} - -.steps li {display: inline-block;margin-right: -3px;} - - -footer { - font-size: 12px; - opacity: 0.7; - overflow: hidden; - margin-top: 15px; - } - -footer p {float:left;} -footer ul {float:right;} -footer ul li {display: inline-block;margin-left: 15px;} -footer a {color: inherit;} - - -.registration { - background: url(../images/signup-bg-box.png) #fff 30px 25px no-repeat !important; - padding: 20px; - padding-left: 190px; - padding-top: 50px; - background: none; - width: 530px; - margin: 15px auto; - -webkit-box-shadow: px 5px 31px -9px rgba(0,0,0,0.5); - -moz-box-shadow: 4px 5px 31px -9px rgba(0,0,0,0.5); - box-shadow: 0px 2px 5px 0px rgba(0,0,0,0.1); - border-radius: 5px; -} - -.registration li { - background: transparent; - } - -.registration label { - display: block; - font-weight: bold; - color: #000; - margin-bottom: 2px; -} - -.registration input[type=text], -.registration select { - border: 1px solid #dddddd; - box-shadow: 0px 2px 5px 0px rgba(0,0,0,0.1); - border-radius: 3px; - padding: 15px; - font-size: 16px; - width: 85%; -} - -.registration input[type=checkbox] { - box-shadow: none; - padding: 10px; -} - -.registration label span {font-weight: normal; font-style:italic;padding-left: 5px;} - -.registration .btn { - display: inline-block;; - padding: 0.4em 0.7em 0.1em 0.7em; - border-radius: 5px; - border-bottom: 5px solid #db6f00; - background: #f39836; - color: #fff; - font-family: "collatorregular"; - font-size: 1.625em; - text-transform: uppercase; - - /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#f9cc59+1,f39c39+100 */ - background: #f9cc59; /* Old browsers */ - /* IE9 SVG, needs conditional override of 'filter' to 'none' */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPHJhZGlhbEdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY3g9IjUwJSIgY3k9IjUwJSIgcj0iNzUlIj4KICAgIDxzdG9wIG9mZnNldD0iMSUiIHN0b3AtY29sb3I9IiNmOWNjNTkiIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZjM5YzM5IiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L3JhZGlhbEdyYWRpZW50PgogIDxyZWN0IHg9Ii01MCIgeT0iLTUwIiB3aWR0aD0iMTAxIiBoZWlnaHQ9IjEwMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-radial-gradient(top, ellipse cover, #f9cc59 1%, #f39c39 100%); /* FF3.6+ */ - background: -webkit-gradient(radial, top center, 0px, center center, 100%, color-stop(1%,#f9cc59), color-stop(100%,#f39c39)); /* Chrome,Safari4+ */ - background: -webkit-radial-gradient(top, ellipse cover, #f9cc59 1%,#f39c39 100%); /* Chrome10+,Safari5.1+ */ - background: -o-radial-gradient(top, ellipse cover, #f9cc59 1%,#f39c39 100%); /* Opera 12+ */ - background: -ms-radial-gradient(top, ellipse cover, #f9cc59 1%,#f39c39 100%); /* IE10+ */ - background: radial-gradient(ellipse at top, #f9cc59 1%,#f39c39 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f9cc59', endColorstr='#f39c39',GradientType=1 ); /* IE6-8 fallback on horizontal gradient */ - cursor: pointer; -} - -.registration .btn:hover {background: #f9cc59;} - - - - - - - - - - /* ========================================================================== - Helper classes - ========================================================================== */ - -/* - * Hide visually and from screen readers: - */ - -.hidden { - display: none !important; -} - -/* - * Hide only visually, but have it available for screen readers: - * http://snook.ca/archives/html_and_css/hiding-content-for-accessibility - */ - -.visuallyhidden { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} - -/* - * Extends the .visuallyhidden class to allow the element - * to be focusable when navigated to via the keyboard: - * https://www.drupal.org/node/897638 - */ - -.visuallyhidden.focusable:active, -.visuallyhidden.focusable:focus { - clip: auto; - height: auto; - margin: 0; - overflow: visible; - position: static; - width: auto; -} - -/* - * Hide visually and from screen readers, but maintain layout - */ - -.invisible { - visibility: hidden; -} - -/* - * Clearfix: contain floats - * - * For modern browsers - * 1. The space content is one way to avoid an Opera bug when the - * `contenteditable` attribute is included anywhere else in the component. - * Otherwise it causes space to appear at the top and bottom of elements - * that receive the `clearfix` class. - * 2. The use of `table` rather than `block` is only necessary if using - * `:before` to contain the top-margins of child elements. - */ - -.clearfix:before, -.clearfix:after { - content: " "; /* 1 */ - display: table; /* 2 */ -} - -.clearfix:after { - clear: both; -} - -/* ========================================================================== - EXAMPLE Media Queries for Responsive Design. - These examples override the primary ('mobile first') styles. - Modify as content requires. - ========================================================================== */ - -@media only screen and (min-width: 35em) { - /* Style adjustments for viewports that meet the condition */ -} - -@media print, -(-webkit-min-device-pixel-ratio: 1.25), -(min-resolution: 1.25dppx), -(min-resolution: 120dpi) { - /* Style adjustments for high resolution devices */ -} - -/* ========================================================================== - Print styles. - Inlined to avoid the additional HTTP request: - http://www.phpied.com/delay-loading-your-print-css/ - ========================================================================== */ - -@media print { - *, - *:before, - *:after { - background: transparent !important; - color: #000 !important; /* Black prints faster: - http://www.sanbeiji.com/archives/953 */ - box-shadow: none !important; - text-shadow: none !important; - } - - a, - a:visited { - text-decoration: underline; - } - - a[href]:after { - content: " (" attr(href) ")"; - } - - abbr[title]:after { - content: " (" attr(title) ")"; - } - - /* - * Don't show links that are fragment identifiers, - * or use the `javascript:` pseudo protocol - */ - - a[href^="#"]:after, - a[href^="javascript:"]:after { - content: ""; - } - - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - - /* - * Printing Tables: - * http://css-discuss.incutio.com/wiki/Printing_Tables - */ - - thead { - display: table-header-group; - } - - tr, - img { - page-break-inside: avoid; - } - - img { - max-width: 100% !important; - } - - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - - h2, - h3 { - page-break-after: avoid; - } -} diff --git a/src/main/resources/static/images/bg-grey-light.jpg b/src/main/resources/static/images/bg-grey-light.jpg deleted file mode 100644 index 17788f6..0000000 Binary files a/src/main/resources/static/images/bg-grey-light.jpg and /dev/null differ diff --git a/src/main/resources/static/images/bg-orange-light.jpg b/src/main/resources/static/images/bg-orange-light.jpg deleted file mode 100644 index 945cafd..0000000 Binary files a/src/main/resources/static/images/bg-orange-light.jpg and /dev/null differ diff --git a/src/main/resources/static/images/bg-panel.jpg b/src/main/resources/static/images/bg-panel.jpg deleted file mode 100644 index dff5170..0000000 Binary files a/src/main/resources/static/images/bg-panel.jpg and /dev/null differ diff --git a/src/main/resources/static/images/bg1.jpg b/src/main/resources/static/images/bg1.jpg deleted file mode 100644 index bd041a3..0000000 Binary files a/src/main/resources/static/images/bg1.jpg and /dev/null differ diff --git a/src/main/resources/static/images/bg2.jpg b/src/main/resources/static/images/bg2.jpg deleted file mode 100644 index e6d66a6..0000000 Binary files a/src/main/resources/static/images/bg2.jpg and /dev/null differ diff --git a/src/main/resources/static/images/bg3.jpg b/src/main/resources/static/images/bg3.jpg deleted file mode 100644 index 87207b3..0000000 Binary files a/src/main/resources/static/images/bg3.jpg and /dev/null differ diff --git a/src/main/resources/static/images/btn-back.png b/src/main/resources/static/images/btn-back.png deleted file mode 100644 index 2882f98..0000000 Binary files a/src/main/resources/static/images/btn-back.png and /dev/null differ diff --git a/src/main/resources/static/images/dot-blue.png b/src/main/resources/static/images/dot-blue.png deleted file mode 100644 index 9fccf9a..0000000 Binary files a/src/main/resources/static/images/dot-blue.png and /dev/null differ diff --git a/src/main/resources/static/images/egi-logo.png b/src/main/resources/static/images/egi-logo.png deleted file mode 100644 index 60fc0f1..0000000 Binary files a/src/main/resources/static/images/egi-logo.png and /dev/null differ diff --git a/src/main/resources/static/images/favicon.ico b/src/main/resources/static/images/favicon.ico deleted file mode 100644 index a1bf43c..0000000 Binary files a/src/main/resources/static/images/favicon.ico and /dev/null differ diff --git a/src/main/resources/static/images/fff.png b/src/main/resources/static/images/fff.png deleted file mode 100644 index ad8d037..0000000 Binary files a/src/main/resources/static/images/fff.png and /dev/null differ diff --git a/src/main/resources/static/images/graph.png b/src/main/resources/static/images/graph.png deleted file mode 100644 index f98070f..0000000 Binary files a/src/main/resources/static/images/graph.png and /dev/null differ diff --git a/src/main/resources/static/images/header-openid.png b/src/main/resources/static/images/header-openid.png deleted file mode 100644 index ef4be5c..0000000 Binary files a/src/main/resources/static/images/header-openid.png and /dev/null differ diff --git a/src/main/resources/static/images/header-reg.png b/src/main/resources/static/images/header-reg.png deleted file mode 100644 index a1217e7..0000000 Binary files a/src/main/resources/static/images/header-reg.png and /dev/null differ diff --git a/src/main/resources/static/images/ico-addfile.png b/src/main/resources/static/images/ico-addfile.png deleted file mode 100644 index e214a80..0000000 Binary files a/src/main/resources/static/images/ico-addfile.png and /dev/null differ diff --git a/src/main/resources/static/images/ico-check-big.png b/src/main/resources/static/images/ico-check-big.png deleted file mode 100644 index 8f9d22a..0000000 Binary files a/src/main/resources/static/images/ico-check-big.png and /dev/null differ diff --git a/src/main/resources/static/images/ico-check.png b/src/main/resources/static/images/ico-check.png deleted file mode 100644 index 7e712db..0000000 Binary files a/src/main/resources/static/images/ico-check.png and /dev/null differ diff --git a/src/main/resources/static/images/ico-dashboard.png b/src/main/resources/static/images/ico-dashboard.png deleted file mode 100644 index 1bdf5cc..0000000 Binary files a/src/main/resources/static/images/ico-dashboard.png and /dev/null differ diff --git a/src/main/resources/static/images/ico-team.png b/src/main/resources/static/images/ico-team.png deleted file mode 100644 index 55bbbed..0000000 Binary files a/src/main/resources/static/images/ico-team.png and /dev/null differ diff --git a/src/main/resources/static/images/ico-user-big.png b/src/main/resources/static/images/ico-user-big.png deleted file mode 100644 index dc523e3..0000000 Binary files a/src/main/resources/static/images/ico-user-big.png and /dev/null differ diff --git a/src/main/resources/static/images/ico-user.png b/src/main/resources/static/images/ico-user.png deleted file mode 100644 index be4f685..0000000 Binary files a/src/main/resources/static/images/ico-user.png and /dev/null differ diff --git a/src/main/resources/static/images/light.png b/src/main/resources/static/images/light.png deleted file mode 100644 index 0fb0fe7..0000000 Binary files a/src/main/resources/static/images/light.png and /dev/null differ diff --git a/src/main/resources/static/images/logo-egi-panel.png b/src/main/resources/static/images/logo-egi-panel.png deleted file mode 100644 index 54f4984..0000000 Binary files a/src/main/resources/static/images/logo-egi-panel.png and /dev/null differ diff --git a/src/main/resources/static/images/logo-egi.png b/src/main/resources/static/images/logo-egi.png deleted file mode 100644 index d117f6c..0000000 Binary files a/src/main/resources/static/images/logo-egi.png and /dev/null differ diff --git a/src/main/resources/static/images/logo-plgrid.png b/src/main/resources/static/images/logo-plgrid.png deleted file mode 100644 index 924c4db..0000000 Binary files a/src/main/resources/static/images/logo-plgrid.png and /dev/null differ diff --git a/src/main/resources/static/images/shadow.png b/src/main/resources/static/images/shadow.png deleted file mode 100644 index dd4d38f..0000000 Binary files a/src/main/resources/static/images/shadow.png and /dev/null differ diff --git a/src/main/resources/static/images/signup-bg-box.png b/src/main/resources/static/images/signup-bg-box.png deleted file mode 100644 index 3d0f38f..0000000 Binary files a/src/main/resources/static/images/signup-bg-box.png and /dev/null differ diff --git a/src/main/resources/static/images/sort_asc.png b/src/main/resources/static/images/sort_asc.png deleted file mode 100644 index 366e125..0000000 Binary files a/src/main/resources/static/images/sort_asc.png and /dev/null differ diff --git a/src/main/resources/static/images/sort_asc_disabled.png b/src/main/resources/static/images/sort_asc_disabled.png deleted file mode 100644 index 366e125..0000000 Binary files a/src/main/resources/static/images/sort_asc_disabled.png and /dev/null differ diff --git a/src/main/resources/static/images/sort_both.png b/src/main/resources/static/images/sort_both.png deleted file mode 100644 index 2891077..0000000 Binary files a/src/main/resources/static/images/sort_both.png and /dev/null differ diff --git a/src/main/resources/static/images/sort_desc.png b/src/main/resources/static/images/sort_desc.png deleted file mode 100644 index 43a0343..0000000 Binary files a/src/main/resources/static/images/sort_desc.png and /dev/null differ diff --git a/src/main/resources/static/images/sort_desc_disabled.png b/src/main/resources/static/images/sort_desc_disabled.png deleted file mode 100644 index 43a0343..0000000 Binary files a/src/main/resources/static/images/sort_desc_disabled.png and /dev/null differ diff --git a/src/main/resources/static/images/step1-check.png b/src/main/resources/static/images/step1-check.png deleted file mode 100644 index dd94356..0000000 Binary files a/src/main/resources/static/images/step1-check.png and /dev/null differ diff --git a/src/main/resources/static/images/step1.png b/src/main/resources/static/images/step1.png deleted file mode 100644 index 86bad45..0000000 Binary files a/src/main/resources/static/images/step1.png and /dev/null differ diff --git a/src/main/resources/static/images/step2-check.png b/src/main/resources/static/images/step2-check.png deleted file mode 100644 index 3ab91d6..0000000 Binary files a/src/main/resources/static/images/step2-check.png and /dev/null differ diff --git a/src/main/resources/static/images/step2.png b/src/main/resources/static/images/step2.png deleted file mode 100644 index fe3f4ed..0000000 Binary files a/src/main/resources/static/images/step2.png and /dev/null differ diff --git a/src/main/resources/static/images/step3-check.png b/src/main/resources/static/images/step3-check.png deleted file mode 100644 index 48214a2..0000000 Binary files a/src/main/resources/static/images/step3-check.png and /dev/null differ diff --git a/src/main/resources/static/images/step3.png b/src/main/resources/static/images/step3.png deleted file mode 100644 index 2c4ccde..0000000 Binary files a/src/main/resources/static/images/step3.png and /dev/null differ diff --git a/src/main/resources/static/js/dashboard/dashboard.controller.js b/src/main/resources/static/js/dashboard/dashboard.controller.js deleted file mode 100644 index 7944dbf..0000000 --- a/src/main/resources/static/js/dashboard/dashboard.controller.js +++ /dev/null @@ -1,51 +0,0 @@ -angular.module('indigo.dashboard', ['ngRoute']).config(function ($routeProvider) { - $routeProvider.when('/dashboard', {templateUrl: 'js/dashboard/dashboard.view.html', controller: 'dashboardCtrl', - activetab: 'dashboard', - data: { - //authorizedRoles: [USER_ROLES.admin, USER_ROLES.editor] - }}); -}).controller('dashboardCtrl', function ($scope, $location, $routeParams, DashboardResource, DocumentResource, SESSION, Sites) { - $scope.slas = []; - $scope.Sites = Sites; - - var type = 'userDashboard'; - - if($routeParams.type == undefined) { - if(SESSION.roles.indexOf('ROLE_PROVIDER') != -1) - type = 'providerDashboard'; - } else { - type = $routeParams.type; - } - - - - - DashboardResource.query({type: type}, function (data) { - $scope.slas = data.data; - - data.data.forEach(function (sla_type) { - sla_type.slas = []; - DocumentResource.query({query_id: sla_type.id}, function (data) { - sla_type.documents = data.data; - }); - }) - }, function (resonse) { - - }); - - $scope.addDocument = function () { - $location.path('/component'); - }; - - $scope.editDocument = function (documentId) { - $location.path('/component/'+documentId); - }; - - $scope.removeDocument = function (documentId) { - - }; - - $scope.acceptDocument = function (documentId) { - - } -}); \ No newline at end of file diff --git a/src/main/resources/static/js/dashboard/dashboard.service.js b/src/main/resources/static/js/dashboard/dashboard.service.js deleted file mode 100644 index c0e981a..0000000 --- a/src/main/resources/static/js/dashboard/dashboard.service.js +++ /dev/null @@ -1,53 +0,0 @@ -angular.module('indigo.dashboard') - .service('DashboardResource', function ($resource) { - //tyoe can be either userDashboard or providerDashboard - return $resource('/query/available?queryCategoryId=:type', {type: '@userDashboard'}, { - query: {method: 'GET'} - }); - }) - .service('Sites', function ($resource, $q) { - var res = $resource('api/sites', {}, {query: {method: 'GET'}}); - - var sites = {}; - res.query({}, function (data) { - data.rows.forEach(function (site) { - sites[site.id] = site; - }); - }); - - return sites; - }) - .service('DocumentResource', function ($resource, EngineInterceptor) { - - - return $resource('/query/documents?queryId=:query_id', {query_id: '@query_id', id: '@id', action: '@action'}, { - query: {method: 'GET'}, - get: {method: 'GET', url: '/component/getwithextradata?documentId=:id', interceptor: EngineInterceptor}, - metrics: {method: 'GET', url: 'api/metrics?type=computing', isArray: true}, - query_action: {method: 'GET', url: 'api/sla_action/:id', isArray: true}, - perform_action: {method: 'POST', url: 'api/sla_action/:id', transformRequest: EngineInterceptor.request}, - create: {method: 'POST', url: 'api/sla', transformRequest: EngineInterceptor.request}, - update: {method: 'PUT', url: 'api/sla/:id', transformRequest: EngineInterceptor.request}, - //sites: {method: 'GET', url: 'http://indigo.cloud.plgrid.pl/cmdb/service/list'} - sites: {method: 'GET', url: 'api/sites'} - }) - }).service('EngineInterceptor', function () { - return { - response: function (response) { - return response.resource.data; - }, - responseError: function (response) { - return response; - }, - request: function (data, headersGetter) { - var site = data.site; - console.log('parsing request'); - if(site && site.id) { - data.site = site.id; - data.siteName = site.value.provider_id; - } - - return angular.toJson(data) - } - } -}); \ No newline at end of file diff --git a/src/main/resources/static/js/dashboard/dashboard.view.html b/src/main/resources/static/js/dashboard/dashboard.view.html deleted file mode 100644 index 06bdfaf..0000000 --- a/src/main/resources/static/js/dashboard/dashboard.view.html +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/src/main/resources/static/js/dashboard/document.controller.js b/src/main/resources/static/js/dashboard/document.controller.js deleted file mode 100644 index 4e5f539..0000000 --- a/src/main/resources/static/js/dashboard/document.controller.js +++ /dev/null @@ -1,125 +0,0 @@ -angular.module('indigo.dashboard').config(function ($routeProvider) { - $routeProvider.when('/component/:document_id', {templateUrl: 'js/dashboard/component.view.html', controller: 'documentCtrl', - activetab: 'dashboard', - data: { - //authorizedRoles: [USER_ROLES.admin, USER_ROLES.editor] - }}); - $routeProvider.when('/component', {templateUrl: 'js/dashboard/component.view.html', controller: 'documentCtrl', - activetab: 'dashboard', - data: { - //authorizedRoles: [USER_ROLES.admin, USER_ROLES.editor] - }}); -}).controller('documentCtrl', function ($scope, $route, $location, DashboardResource, DocumentResource) { - console.log($route.current.params.document_id); - $scope.documentId = $route.current.params.document_id; - $scope.state = 'form'; - $scope.metrics = []; - $scope.metrics_d = {}; - $scope.sla = {site: null, name: '', id: $scope.documentId, metrics: {}, editable: false}; - $scope.sites = []; - $scope.actions = []; - - $scope.loadDocument = function () { - var sla = null; - - if($scope.documentId) { - DocumentResource.get({id: $scope.documentId}, function (data) { - $scope.actions = data.actions; - sla = data.document; - - for (var metric in sla.metrics) { - if (sla.metrics.hasOwnProperty(metric) && metric != 'weightComputing') { - if ($scope.metrics_d[metric].inputType == 'DATE' && sla.metrics[metric] != null) { - sla.metrics[metric] = new Date(sla.metrics[metric]); - } - - } - } - - $scope.sla = sla; - - $scope.sites.forEach(function (site) { - if(site.id == sla.site){ - sla.site = site; - } - }); - - //check whether component is editable - $scope.actions.forEach(function (action) { - if(action.id == 'editDraft') - //setting it in sla is for possible future compatibility - sla.editable = true; - }) - }, function (response) { - - }) - } - }; - - - $scope.sites = DocumentResource.sites({}, function (data) { - $scope.sites = data.rows; - $scope.sla.site = data.rows[0]; - $scope.loadMetrics(); - }, function (response) { - $location.url('/error?message=sitesUnavailable'); - }); - - $scope.loadMetrics = function () { - DocumentResource.metrics({}, function (data) { - $scope.metrics = data; - - - - $scope.metrics.forEach(function (metric) { - if(!$scope.documentId) - $scope.sla.metrics[metric.id] = null; - $scope.metrics_d[metric.id] = metric; - }); - - $scope.loadDocument(); - - }, function (response) { - - }); - }; - - $scope.getMetricClasses = function (metric) { - if(metric.unit && metric.unit != 'none') { - return 'input-group'; - } - return ''; - }; - - $scope.sendRequest = function (form, sla) { - if(!form.$valid) - return; - var action = 'create'; - if(sla.id) - action = 'update'; - - - DocumentResource[action](sla, function (data) { - $scope.state = 'success'; - }, function (response) { - - }); - }; - $scope.deleteRequest = function (sla) { - DocumentResource.delete({id: $scope.documentId}, function (data) { - $scope.state = 'deleted'; - }, function (response) { - - }); - }; - $scope.performAction = function (form, action, sla) { - if(!form.$valid) - return; - $scope.sla.action = action; - DocumentResource.perform_action(sla, function (data) { - $scope.state = 'success'; - }, function (response) { - - }); - }; -}); \ No newline at end of file diff --git a/src/main/resources/static/js/dashboard/document.view.html b/src/main/resources/static/js/dashboard/document.view.html deleted file mode 100644 index dea1f45..0000000 --- a/src/main/resources/static/js/dashboard/document.view.html +++ /dev/null @@ -1,59 +0,0 @@ -
-

Request

- -
-
- -
- - - - - - - - -
-
-

Site in which apply for resources

-
-
- -
- -
-
- -
-
-
-

Request's name

-
-
- -
- -
-
- - {{metric.unit}} -
-
-
-

{{metric.description}}

-
-
- -
- - -
-
-
-

Action has been successfully carried out (back)

-
-
-

Request has been successfully deleted (back)

-
\ No newline at end of file diff --git a/src/main/resources/static/js/profile/profile.controller.js b/src/main/resources/static/js/profile/profile.controller.js deleted file mode 100644 index a3ccfaa..0000000 --- a/src/main/resources/static/js/profile/profile.controller.js +++ /dev/null @@ -1,9 +0,0 @@ -angular.module('indigo.profile', ['ngRoute']).config(function ($routeProvider) { - $routeProvider.when('/profile', {templateUrl: 'js/profile/profile.view.html', controller: 'profileCtrl', - activetab: 'profile', - data: { - //authorizedRoles: [USER_ROLES.admin, USER_ROLES.editor] - }}); -}).controller('profileCtrl', function ($scope) { - -}); \ No newline at end of file diff --git a/src/main/resources/static/js/profile/profile.view.html b/src/main/resources/static/js/profile/profile.view.html deleted file mode 100644 index 3a6cce8..0000000 --- a/src/main/resources/static/js/profile/profile.view.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
\ No newline at end of file diff --git a/src/main/resources/static/js/view/account.html b/src/main/resources/static/js/view/account.html deleted file mode 100644 index d646ff8..0000000 --- a/src/main/resources/static/js/view/account.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
-
- -
-
-
-
diff --git a/src/main/resources/static/js/view/add-affiliation.html b/src/main/resources/static/js/view/add-affiliation.html deleted file mode 100644 index 38768cf..0000000 --- a/src/main/resources/static/js/view/add-affiliation.html +++ /dev/null @@ -1,70 +0,0 @@ - -
-

Add new affiliation

- -
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - Cancel - -
    • -
- -
diff --git a/src/main/resources/static/js/view/affiliation-view.html b/src/main/resources/static/js/view/affiliation-view.html deleted file mode 100644 index 3fdceeb..0000000 --- a/src/main/resources/static/js/view/affiliation-view.html +++ /dev/null @@ -1,90 +0,0 @@ - -
-

{{affiliation.institution}}

-
-
    - -
  • - Institution type: - {{affiliation.type}} -
    • - -
  • - Name: - {{affiliation.name}} -
    • - -
  • - Acronym: - {{affiliation.acronym}} -
    • - -
  • - Department/Center: - {{affiliation.department}} -
    • - -
  • - Address: - {{affiliation.address}} -
    • - -
  • - ZIP code: - {{affiliation.zipCode}} -
    • - -
  • - City: - {{affiliation.city}} -
    • - -
  • - Country / NGI: - {{affiliation.country}} -
    • - -
  • - Phone: - {{affiliation.primaryPhone}} -
    • - -
  • - Secondary Phone: - {{affiliation.secondaryPhone}} -
    • - -
-
-

- Back to profile and affiliations -

-
-
-
    -
  • -
    - -
    -

    - Status: {{affiliation.status}} -

    -
    • -
  • -
    - -
    -

    - Updated: {{affiliation.lastUpdateDate | date:'MM/dd/yyyy'}} -

    -
    • -
- -
-
- diff --git a/src/main/resources/static/js/view/affiliations-list.html b/src/main/resources/static/js/view/affiliations-list.html deleted file mode 100644 index 6746c96..0000000 --- a/src/main/resources/static/js/view/affiliations-list.html +++ /dev/null @@ -1,32 +0,0 @@ -

- Affiliations - Add affiliation -

- - - -
- To apply for a personal allocation you need to have confirmed affiliation - Add your first affiliation -
- - -
- - - - - - - - - - - - - -
NameStatusDate
- - {{affiliation.department+" / "+affiliation.name}} - - {{affiliation.status}}{{affiliation.lastUpdateDate | date:'MM.dd.yyyy'}}
diff --git a/src/main/resources/static/js/view/affiliations-management-list.html b/src/main/resources/static/js/view/affiliations-management-list.html deleted file mode 100644 index 3a70ecf..0000000 --- a/src/main/resources/static/js/view/affiliations-management-list.html +++ /dev/null @@ -1,26 +0,0 @@ -
-

- Affiliations management -

- -
- - - - - - - - - - - - - -
NameStatusDate
- {{affiliation.department+" / "+affiliation.name}} {{affiliation.status}}{{affiliation.lastUpdateDate | date:'MM.dd.yyyy'}}
-
-
- - diff --git a/src/main/resources/static/js/view/dashboard.html b/src/main/resources/static/js/view/dashboard.html deleted file mode 100644 index 3ad18bb..0000000 --- a/src/main/resources/static/js/view/dashboard.html +++ /dev/null @@ -1,26 +0,0 @@ -
-
-

Hello

-

- Welcome to Indigo-SLAM. -

-
- -

Are you new here? - Read information about our project -

-
- -
-
-

First steps

-
    -
  • -
    • -
    • -
    • -
    • -
-
-
- diff --git a/src/main/resources/static/js/view/footer.html b/src/main/resources/static/js/view/footer.html deleted file mode 100644 index a15a716..0000000 --- a/src/main/resources/static/js/view/footer.html +++ /dev/null @@ -1,8 +0,0 @@ - -
-
-

- ©2015 -

-
-
\ No newline at end of file diff --git a/src/main/resources/static/js/view/indigo/document.html b/src/main/resources/static/js/view/indigo/document.html deleted file mode 100644 index b706d14..0000000 --- a/src/main/resources/static/js/view/indigo/document.html +++ /dev/null @@ -1,196 +0,0 @@ - - - -
- -
-

- {{::document.name}} - {{::document.site}} - - {{branchOfScience}} -

-
-
-
-
- - - - -
-
-
- - - - - - - - - - - - - -
-
-

-
    -
  • - -
    -
    • -
-
-
- Gotowe - -
-
- - - - - - -
- - - -
-
-
- -
-

-
-
- -
-
- -
-

- {{metricFormValues[metricId]}} - -

-
-
-
-
-
- -
- -

-

- - - - -
- - - - - - - -