Skip to content

Commit

Permalink
some more subscription id improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Mar 17, 2017
1 parent 5adcbef commit 7334eb4
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 25 deletions.
6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
View file
Expand Up @@ -128,12 +128,12 @@
<div wicket:id="debugPanel" style="z-index: 10000;"/>
</section>
</div>
<footer class="main-footer">
<footer wicket:id="footerContainer" class="main-footer">
<div class="pull-right hidden-xs" wicket:id="version">
<b><wicket:message key="PageTemplate.version"/></b> <wicket:message key="pageBase.midPointVersion"/>
</div>
<div wicket:id="subscriptionMessage" class="pull-left"/>
<wicket:message key="PageTemplate.copy" class="pull-right"/>
<div wicket:id="copyrightMessage" class="pull-left"><wicket:message key="PageTemplate.copy" /></div>
<div wicket:id="subscriptionMessage"/>
</footer>
</div>

Expand Down
51 changes: 33 additions & 18 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Expand Up @@ -188,6 +188,8 @@ public abstract class PageBase extends WebPage implements ModelServiceLocator {
private static final String ID_MAIN_POPUP = "mainPopup";
private static final String ID_MAIN_POPUP_BODY = "popupBody";
private static final String ID_SUBSCRIPTION_MESSAGE = "subscriptionMessage";
private static final String ID_FOOTER_CONTAINER = "footerContainer";
private static final String ID_COPYRIGHT_MESSAGE = "copyrightMessage";
private static final String ID_LOGO = "logo";
private static final String ID_CUSTOM_LOGO = "customLogo";
private static final String ID_CUSTOM_LOGO_IMG_SRC = "customLogoImgSrc";
Expand Down Expand Up @@ -696,6 +698,11 @@ public boolean isVisible(){
sidebarMenu.add(createUserStatusBehaviour(true));
add(sidebarMenu);

WebMarkupContainer footerContainer = new WebMarkupContainer(ID_FOOTER_CONTAINER);
footerContainer.setOutputMarkupId(true);
footerContainer.add(getFooterVisibleBehaviour());
add(footerContainer);

WebMarkupContainer version = new WebMarkupContainer(ID_VERSION) {
private static final long serialVersionUID = 1L;

Expand All @@ -712,7 +719,11 @@ public boolean isVisible() {
return RuntimeConfigurationType.DEVELOPMENT.equals(getApplication().getConfigurationType());
}
});
add(version);
footerContainer.add(version);

WebMarkupContainer copyrightMessage = new WebMarkupContainer(ID_COPYRIGHT_MESSAGE);
copyrightMessage.add(getFooterVisibleBehaviour());
footerContainer.add(copyrightMessage);

Label subscriptionMessage = new Label(ID_SUBSCRIPTION_MESSAGE,
new AbstractReadOnlyModel<String>() {
Expand All @@ -722,30 +733,17 @@ public boolean isVisible() {
public String getObject() {
String subscriptionId = getSubscriptionId();
if (!WebComponentUtil.isSubscriptionIdCorrect(subscriptionId)){
return createStringResource("PageBase.nonActiveSubscriptionMessage").getString() + " ";
return " " + createStringResource("PageBase.nonActiveSubscriptionMessage").getString();
}
if (SubscriptionType.DEMO_SUBSRIPTION.getSubscriptionType().equals(subscriptionId.substring(0, 2))){
return createStringResource("PageBase.demoSubscriptionMessage").getString() + " ";
return " " + createStringResource("PageBase.demoSubscriptionMessage").getString();
}
return "";
}
});
subscriptionMessage.setOutputMarkupId(true);
subscriptionMessage.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
String subscriptionId = getSubscriptionId();
if (StringUtils.isEmpty(subscriptionId)){
return true;
}
return !WebComponentUtil.isSubscriptionIdCorrect(subscriptionId) ||
(SubscriptionType.DEMO_SUBSRIPTION.getSubscriptionType().equals(subscriptionId.substring(0, 2))
&& WebComponentUtil.isSubscriptionIdCorrect(subscriptionId));
}
});
add(subscriptionMessage);
subscriptionMessage.add(getFooterVisibleBehaviour());
footerContainer.add(subscriptionMessage);

WebMarkupContainer feedbackContainer = new WebMarkupContainer(ID_FEEDBACK_CONTAINER);
feedbackContainer.setOutputMarkupId(true);
Expand Down Expand Up @@ -1847,4 +1845,21 @@ private String getSubscriptionId(){
}
return deploymentInfoModel.getObject().getSubscriptionIdentifier();
}

private VisibleEnableBehaviour getFooterVisibleBehaviour(){
return new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
String subscriptionId = getSubscriptionId();
if (StringUtils.isEmpty(subscriptionId)){
return true;
}
return !WebComponentUtil.isSubscriptionIdCorrect(subscriptionId) ||
(SubscriptionType.DEMO_SUBSRIPTION.getSubscriptionType().equals(subscriptionId.substring(0, 2))
&& WebComponentUtil.isSubscriptionIdCorrect(subscriptionId));
}
};
}
}
6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -1149,8 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache
pageBase.midPointVersion=${pom.version}, ${git.describe}
pageBase.unknownBuildNumber=unknown
PageBase.subscriptionMessage=Non-subscription.
PageBase.nonActiveSubscriptionMessage=Powered by a free midPoint community subscription. Please consider purchasing subscription today.
PageBase.demoSubscriptionMessage=Powered by Evolveum demo subscription.
PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription.
PageBase.demoSubscriptionMessage=Demo subscription.
PageBulkAction.async=Asynchronous
PageBulkAction.button.start=Start
PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script.
Expand Down Expand Up @@ -2972,7 +2972,7 @@ PageAdmin.menu.assignments=Assignments
PageAdmin.menu.credentials=Credentials
PageAdmin.menu.request=Request a role
PageTemplate.version=Version\:
PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a> and partners.</strong> Thank you for using <a href\="http\://midpoint.evolveum.com" target\="_blank">midPoint</a>
PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.</strong>
PageTemplate.toggleNavigation=Toggle navigation
PageTemplate.user=user
PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0}
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
View file
Expand Up @@ -2962,7 +2962,7 @@ PageAdmin.menu.assignments=Assignments
PageAdmin.menu.credentials=Credentials
PageAdmin.menu.request=Request a role
PageTemplate.version=Version\:
PageTemplate.copy=<strong>Copyright &copy; 2010-2016 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a> and partners.</strong> Thank you for using <a href\="http\://midpoint.evolveum.com" target\="_blank">midPoint</a>.
PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.</strong>
PageTemplate.toggleNavigation=Toggle navigation
PageTemplate.user=user
PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0}
Expand Down

0 comments on commit 7334eb4

Please sign in to comment.