Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Aug 30, 2018
2 parents 8d2b61d + f0534d7 commit e50f9f1
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 57 deletions.
7 changes: 6 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
View file
Expand Up @@ -96,7 +96,12 @@
</a>
</li>
</ol>
<ul class="nav navbar-nav">
<a wicket:id="cartButton" class="shopping-cart-icon">
<i class="fa fa-shopping-cart fa-2x shopping-cart-icon"></i>
<span wicket:id="itemsCount" class="badge bg-red"
style="position: absolute; top: 1px; margin-left: 20px;"></span>
</a>
<ul class="nav navbar-nav pull-right">
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu" wicket:id="rightMenu"/>
<li>
Expand Down
46 changes: 46 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Expand Up @@ -127,7 +127,9 @@
import org.apache.commons.lang.Validate;
import org.apache.wicket.*;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.devutils.debugbar.DebugBar;
Expand Down Expand Up @@ -193,6 +195,8 @@ public abstract class PageBase extends WebPage implements ModelServiceLocator {
private static final String ID_FEEDBACK = "feedback";
private static final String ID_DEBUG_BAR = "debugBar";
private static final String ID_CLEAR_CACHE = "clearCssCache";
private static final String ID_CART_BUTTON = "cartButton";
private static final String ID_CART_ITEMS_COUNT = "itemsCount";
private static final String ID_SIDEBAR_MENU = "sidebarMenu";
private static final String ID_RIGHT_MENU = "rightMenu";
private static final String ID_LOCALE = "locale";
Expand Down Expand Up @@ -796,6 +800,44 @@ public boolean isVisible() {
}
};
mainHeader.add(breadcrumbs);

initCartButton(mainHeader);
}

private void initCartButton(WebMarkupContainer mainHeader){
AjaxButton cartButton = new AjaxButton(ID_CART_BUTTON) {
private static final long serialVersionUID = 1L;

@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
}

@Override
public void onClick(AjaxRequestTarget ajaxRequestTarget) {
navigateToNext(new PageAssignmentsList(true));
}
};
cartButton.setOutputMarkupId(true);
cartButton.add(createUserStatusBehaviour(true));
mainHeader.add(cartButton);

Label cartItemsCount = new Label(ID_CART_ITEMS_COUNT, new LoadableModel<String>(true) {
private static final long serialVersionUID = 1L;

@Override
public String load(){
return Integer.toString(getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size());
}
});
cartItemsCount.add(new VisibleEnableBehaviour() {
@Override
public boolean isVisible() {
return !(getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size() == 0);
}
});
cartItemsCount.setOutputMarkupId(true);
cartButton.add(cartItemsCount);
}

private void initLayout() {
Expand Down Expand Up @@ -2312,6 +2354,10 @@ protected String determineDataLanguage() {
}
}

protected void reloadShoppingCartIcon(AjaxRequestTarget target){
target.add(get(createComponentPath(ID_MAIN_HEADER, ID_NAVIGATION, ID_CART_BUTTON)));
}

public AsyncWebProcessManager getAsyncWebProcessManager() {
return MidPointApplication.get().getAsyncWebProcessManager();
}
Expand Down
7 changes: 0 additions & 7 deletions ...min-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
View file
Expand Up @@ -31,13 +31,6 @@
</div>
<div class="col-md-6" wicket:id="targetUserPanel"/>
</div>
<div class="col-md-1 pull-right">
<a wicket:id="cartButton">
<i class="fa fa-shopping-cart fa-2x"></i>
<span wicket:id="itemsCount" class="badge bg-red"
style="position: absolute; top: -1px; left: 30px;"></span>
</a>
</div>
</div>
<div wicket:id="relationContainer" class="row">
<div class="form-group col-md-3">
Expand Down
55 changes: 6 additions & 49 deletions ...min-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
View file
Expand Up @@ -62,8 +62,6 @@ public class PageAssignmentShoppingCart<R extends AbstractRoleType> extends Page
private static final long serialVersionUID = 1L;

private static final String ID_MAIN_FORM = "mainForm";
private static final String ID_CART_BUTTON = "cartButton";
private static final String ID_CART_ITEMS_COUNT = "itemsCount";
private static final String ID_TARGET_USER_PANEL = "targetUserPanel";
private static final String ID_VIEWS_TAB_PANEL = "viewsTabPanel";
private static final String ID_PARAMETERS_PANEL = "parametersPanel";
Expand Down Expand Up @@ -102,7 +100,6 @@ protected void onInitialize() {
mainForm.add(parametersPanel);

initTargetUserSelectionPanel(parametersPanel);
initCartButton(parametersPanel);
initRelationPanel(parametersPanel);
}

Expand Down Expand Up @@ -145,7 +142,7 @@ public WebMarkupContainer createPanel(String panelId) {

@Override
protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
target.add(getCartButton());
reloadShoppingCartIcon(target);
}

@Override
Expand Down Expand Up @@ -174,7 +171,7 @@ protected QName getQueryType() {

@Override
protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
target.add(getCartButton());
reloadShoppingCartIcon(target);
}

@Override
Expand All @@ -201,7 +198,7 @@ protected QName getQueryType() {

@Override
protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
target.add(getCartButton());
reloadShoppingCartIcon(target);
}

@Override
Expand All @@ -228,7 +225,7 @@ protected QName getQueryType() {

@Override
protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
target.add(getCartButton());
reloadShoppingCartIcon(target);
}

@Override
Expand All @@ -250,7 +247,7 @@ public WebMarkupContainer createPanel(String panelId) {

@Override
protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
target.add(getCartButton());
reloadShoppingCartIcon(target);
}

@Override
Expand Down Expand Up @@ -333,41 +330,6 @@ protected void multipleUsersSelectionPerformed(AjaxRequestTarget target, List<Us
parametersPanel.add(targetUserPanel);
}

private void initCartButton(WebMarkupContainer parametersPanel){
AjaxButton cartButton = new AjaxButton(ID_CART_BUTTON) {
private static final long serialVersionUID = 1L;

@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
}

@Override
public void onClick(AjaxRequestTarget ajaxRequestTarget) {
navigateToNext(new PageAssignmentsList(true));
}
};
cartButton.setOutputMarkupId(true);
parametersPanel.add(cartButton);

Label cartItemsCount = new Label(ID_CART_ITEMS_COUNT, new LoadableModel<String>(true) {
private static final long serialVersionUID = 1L;

@Override
public String load(){
return Integer.toString(getRoleCatalogStorage().getAssignmentShoppingCart().size());
}
});
cartItemsCount.add(new VisibleEnableBehaviour() {
@Override
public boolean isVisible() {
return !(getRoleCatalogStorage().getAssignmentShoppingCart().size() == 0);
}
});
cartItemsCount.setOutputMarkupId(true);
cartButton.add(cartItemsCount);
}

private void initRelationPanel(WebMarkupContainer parametersPanel){
WebMarkupContainer relationContainer = new WebMarkupContainer(ID_RELATION_CONTAINER);
relationContainer.setOutputMarkupId(true);
Expand All @@ -378,7 +340,7 @@ private void initRelationPanel(WebMarkupContainer parametersPanel){
}

private QName getRelationParameterValue(){
return getRelationDropDown().getModel().getObject();
return getRelationDropDown().getRelationValue();
}

private RelationDropDownChoicePanel getRelationDropDown(){
Expand Down Expand Up @@ -412,9 +374,4 @@ private String getTargetUserSelectionButtonLabel(List<UserType> usersList){
usersList.size()).getString();
}
}

private AjaxButton getCartButton(){
return (AjaxButton) get(ID_MAIN_FORM).get(ID_PARAMETERS_PANEL).get(ID_CART_BUTTON);
}

}
6 changes: 6 additions & 0 deletions gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
View file
Expand Up @@ -1202,6 +1202,12 @@ dd.stacktrace::before {
min-height: 460px;
}

.shopping-cart-icon {
color: #f4f4f4;
margin-top: 10px;
margin-right: 5px;
}

.shopping-cart-item-box {

.inner {
Expand Down

0 comments on commit e50f9f1

Please sign in to comment.