gCubeSystem
/
species-discovery
Archived
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated custom style sheet 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@141546 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2017-01-13 11:07:06 +00:00
parent 2b71b38a8b
commit da1885eba9
2 changed files with 119 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SpeciesSearchFormPanel.java
View File

@ -93,9 +93,7 @@ public class SpeciesSearchFormPanel extends ContentPanel {
bind(); bind();
horizontalQueryPanel.setStyleAttribute("margin-left", "10px"); horizontalQueryPanel.setStyleAttribute("margin-left", "10px");
horizontalQueryPanel.setStyleAttribute("margin-top", "15px"); horizontalQueryPanel.setStyleAttribute("margin-top", "10px");
// horizontalQueryPanel.setScrollMode(Scroll.AUTO);
// simpleSearchPanel.setScrollMode(Scroll.AUTO);
htmlLabelAdvs.setStyleAttribute("font-size", "11px"); htmlLabelAdvs.setStyleAttribute("font-size", "11px");
htmlLabelAdvs.setStyleAttribute("margin-left", "10px"); htmlLabelAdvs.setStyleAttribute("margin-left", "10px");
@ -415,7 +413,7 @@ public class SpeciesSearchFormPanel extends ContentPanel {
hpAdvancedSearchLinks.setStyleAttribute("border-bottom", "thin solid #99BBE8;"); hpAdvancedSearchLinks.setStyleAttribute("border-bottom", "thin solid #99BBE8;");
hpAdvancedSearchLinks.setStyleAttribute("background-color", "#EFF5FB"); hpAdvancedSearchLinks.setStyleAttribute("background-color", "#EFF5FB");
hpAdvancedSearchLinks.add(htmlLabelAdvs); hpAdvancedSearchLinks.add(htmlLabelAdvs);
hpAdvancedSearchLinks.setHeight(DEFAULTLINKPANELTHEIGHT); //hpAdvancedSearchLinks.setHeight(DEFAULTLINKPANELTHEIGHT);
// imageArrowRight.setStyleAttribute("margin-top", "5px"); // imageArrowRight.setStyleAttribute("margin-top", "5px");
// imageArrowDown.setStyleAttribute("margin-top", "5px"); // imageArrowDown.setStyleAttribute("margin-top", "5px");

18
src/main/java/org/gcube/portlets/user/speciesdiscovery/server/asl/SessionUtil.java
View File

@ -96,11 +96,6 @@ public class SessionUtil {
session.setAttribute(TAXONOMY_OCCURRENCE, searchSession); session.setAttribute(TAXONOMY_OCCURRENCE, searchSession);
} }
// public static void setCurrentTaxonomyChildrenSession(ASLSession session, FetchingSession<TaxonomyRow> searchSession)
// {
// session.setAttribute(TAXONOMY_CHILD, searchSession);
// }
public static ASLSession getAslSession(HttpSession httpSession) public static ASLSession getAslSession(HttpSession httpSession)
{ {
String sessionID = httpSession.getId(); String sessionID = httpSession.getId();
@ -110,30 +105,19 @@ public class SessionUtil {
//for test only //for test only
user = "test.user"; user = "test.user";
// user = "lucio.lelii";
// user = "pasquale.pagano";
// user = "francesco.mangiacrapa";
String scope = "/gcube/devsec"; //Development String scope = "/gcube/devsec"; //Development
// String scope = "/d4science.research-infrastructures.eu/gCubeApps/BiodiversityResearchEnvironment"; //Production // String scope = "/d4science.research-infrastructures.eu/gCubeApps/BiodiversityResearchEnvironment"; //Production
httpSession.setAttribute(USERNAME_ATTRIBUTE, user); httpSession.setAttribute(USERNAME_ATTRIBUTE, user);
ASLSession session = SessionManager.getInstance().getASLSession(sessionID, user); ASLSession session = SessionManager.getInstance().getASLSession(sessionID, user);
session.setScope(scope); session.setScope(scope);
logger.warn("TaxonomySearchServiceImpl STARTING IN TEST MODE - NO USER FOUND"); logger.warn("TaxonomySearchServiceImpl STARTING IN TEST MODE - NO USER FOUND");
logger.warn("Created fake Asl session for user "+user + " with scope "+scope); logger.warn("Created fake Asl session for user "+user + " with scope "+scope);
// session.setScope("/gcube/devsec");
return session; return session;
} }
return SessionManager.getInstance().getASLSession(sessionID, user); return SessionManager.getInstance().getASLSession(sessionID, user);
} }
//MODIFIED******************************************************************************************
public static void setCurrentEJBResultRow(ASLSession session, ResultRowPersistence resultRowPersistence) { public static void setCurrentEJBResultRow(ASLSession session, ResultRowPersistence resultRowPersistence) {
session.setAttribute(EJB_RESULT_ROW, resultRowPersistence); session.setAttribute(EJB_RESULT_ROW, resultRowPersistence);
} }
@ -197,7 +181,6 @@ public class SessionUtil {
} }
/** /**
* *
* @param aslSession * @param aslSession
@ -260,7 +243,6 @@ public class SessionUtil {
} }
/** /**
* @return * @return
* *