gCubeSystem
/
gcube-ckan-datacatalog
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated CSS

This commit is contained in:
Francesco Mangiacrapa 2024-05-14 16:05:29 +02:00
parent f468c745b2
commit 6a18e040c0
9 changed files with 138 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/gcube-ckan-datacatalog-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/gcube-ckan-datacatalog-2.3.0/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
@ -30,10 +30,10 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/gcube-ckan-datacatalog-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/gcube-ckan-datacatalog-2.3.0/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/gcube-ckan-datacatalog-2.3.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/gcube-ckan-datacatalog-2.3.0/WEB-INF/classes"/>
</classpath> </classpath>

2
.settings/com.gwtplugins.gdt.eclipse.core.prefs
View File

@ -1,6 +1,6 @@
>>>>>>>=refs/heads/task_20699 >>>>>>>=refs/heads/task_20699
eclipse.preferences.version=1 eclipse.preferences.version=1
jarsExcludedFromWebInfLib= jarsExcludedFromWebInfLib=
lastWarOutDir=/home/francescomangiacrapa/git/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-2.3.0-SNAPSHOT lastWarOutDir=/home/francescomangiacrapa/git/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-2.3.0
warSrcDir=src/main/webapp warSrcDir=src/main/webapp
warSrcDirIsOutput=false warSrcDirIsOutput=false

118
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
@ -74,8 +74,28 @@
<wb-module deploy-name="gcube-ckan-datacatalog-2.3.0-SNAPSHOT">
<wb-module deploy-name="gcube-ckan-datacatalog-2.3.0">
@ -151,7 +171,17 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -227,7 +257,17 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -303,11 +343,39 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
<dependent-module archiveName="metadata-profile-form-builder-widget-2.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/metadata-profile-form-builder-widget/metadata-profile-form-builder-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="ckan-metadata-publisher-widget-2.2.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -383,7 +451,17 @@
<property name="context-root" value="gcube-ckan-datacatalog"/> <property name="context-root" value="gcube-ckan-datacatalog"/>
@ -459,7 +537,17 @@
<property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/> <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
@ -535,7 +623,17 @@
</wb-module> </wb-module>

5
CHANGELOG.md
View File

@ -4,6 +4,11 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v2.3.1-SNAPSHOT] - 2024-05-14
- Added informative label "Logged in as {ROLE}"
- Included `ckan-metadata-publisher-widget` with bug fix [#27455] and new feature [#27467]
## [v2.3.0] - 2024-02-02 ## [v2.3.0] - 2024-02-02
- Supported the Edit facility [#26639] - Supported the Edit facility [#26639]

5
src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GCubeCkanDataCatalog.java
View File

@ -26,6 +26,8 @@ public class GCubeCkanDataCatalog implements EntryPoint {
public static final String GET_QUERY_STRING_PARAMETER = "query_string"; public static final String GET_QUERY_STRING_PARAMETER = "query_string";
public static final String REVERT_QUERY_PARAM = "manage"; public static final String REVERT_QUERY_PARAM = "manage";
public static final String GCUBE_CKAN_IFRAME = "gcube-ckan-iframe"; public static final String GCUBE_CKAN_IFRAME = "gcube-ckan-iframe";
public static final String LOGGED_IN_DIV = "logged_in";
/** /**
* This is the entry point method. * This is the entry point method.
@ -36,5 +38,8 @@ public class GCubeCkanDataCatalog implements EntryPoint {
eventManager.getEventBus()); eventManager.getEventBus());
eventManager.setPanel(panel); eventManager.setPanel(panel);
} }
} }

4
src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java
View File

@ -36,6 +36,7 @@ import com.google.gwt.user.client.Cookies;
import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.Frame;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.ScrollPanel;
@ -199,6 +200,7 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
managementPanel.visibilityEditItemButton(true); managementPanel.visibilityEditItemButton(true);
managementPanel.visibilityDeleteItemButton(true); managementPanel.visibilityDeleteItemButton(true);
managementPanel.enablePublishItemButton(true); managementPanel.enablePublishItemButton(true);
RootPanel.get(GCubeCkanDataCatalog.LOGGED_IN_DIV).add(new HTML("Logged in as "+RolesCkanGroupOrOrg.ADMIN));
break; break;
} }
case EDITOR: { case EDITOR: {
@ -206,6 +208,7 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
managementPanel.visibilityEditItemButton(true); managementPanel.visibilityEditItemButton(true);
managementPanel.visibilityDeleteItemButton(true); managementPanel.visibilityDeleteItemButton(true);
managementPanel.enablePublishItemButton(true); managementPanel.enablePublishItemButton(true);
RootPanel.get(GCubeCkanDataCatalog.LOGGED_IN_DIV).add(new HTML("Logged in as "+RolesCkanGroupOrOrg.EDITOR));
break; break;
} }
case MEMBER: { case MEMBER: {
@ -215,6 +218,7 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
// not the rights to publish // not the rights to publish
managementPanel.visibilityPublishItemButton(true, true); managementPanel.visibilityPublishItemButton(true, true);
managementPanel.enablePublishItemButton(false); managementPanel.enablePublishItemButton(false);
RootPanel.get(GCubeCkanDataCatalog.LOGGED_IN_DIV).add(new HTML("Logged in as "+RolesCkanGroupOrOrg.MEMBER));
break; break;
} }
default: { default: {

7
src/main/webapp/GCubeCkanDataCatalog.css
View File

@ -179,4 +179,11 @@ h1 {
background-image: none !important; background-image: none !important;
padding: 10px 5px; padding: 10px 5px;
background-color: #FAFAFA; background-color: #FAFAFA;
}
.logged_in_label {
float: right;
margin-right: 20px;
font-size: 12px;
padding-top: 5px;
} }

3
src/main/webapp/GCubeCkanDataCatalog.html
View File

@ -37,6 +37,7 @@
Your web browser must have JavaScript enabled in order for this Your web browser must have JavaScript enabled in order for this
application to display correctly.</div> application to display correctly.</div>
</noscript> </noscript>
<div id="gCubeCkanDataCatalog"></div> <div id="logged_in" class="logged_in_label"></div>
<div id="gCubeCkanDataCatalog" style="padding-top:20px;"></div>
</body> </body>
</html> </html>

6
src/main/webapp/WEB-INF/jsp/GCubeCkanDataCatalogPortlet_view.jsp
View File

@ -28,9 +28,9 @@
<!-- <script type="text/javascript" --> <!-- <script type="text/javascript" -->
<%-- src='<%=request.getContextPath()%>/js/jquery.min.js'></script> --%> <%-- src='<%=request.getContextPath()%>/js/jquery.min.js'></script> --%>
<script type="text/javascript" <script type="text/javascript"
src='<%=request.getContextPath()%>/js/jquery.autosize.js'></script> src='<%=request.getContextPath()%>/js/jquery.autosize.js'></script>
<div id="logged_in" class="logged_in_label"></div>
<div id="gCubeCkanDataCatalog"></div> <div id="gCubeCkanDataCatalog" style="padding-top: 20px;"></div>