Skip to content

Commit

Permalink
just transitional commit, to save the current state
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Jan 20, 2016
1 parent 6a0a330 commit 1c4aab9
Show file tree
Hide file tree
Showing 11 changed files with 141 additions and 60 deletions.
16 changes: 8 additions & 8 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/BaseFocusPanel.java
View file
Expand Up @@ -346,10 +346,10 @@ protected void populateItem(final ListItem<FocusProjectionDto> item) {
protected Component createHeader(String id, IModel<ObjectWrapper<F>> model) {
return new CheckTableHeader(id, (IModel) model) {

@Override
protected List<InlineMenuItem> createMenuItems() {
return createDefaultMenuItems(getModel());
}
// @Override
// protected List<InlineMenuItem> createMenuItems() {
// return createDefaultMenuItems(getModel());
// }
};
}
};
Expand Down Expand Up @@ -415,10 +415,10 @@ protected void populateItem(final ListItem<FocusProjectionDto> item) {
protected Component createHeader(String id, IModel<ObjectWrapper<F>> model) {
return new CheckTableHeader(id, (IModel) model) {

@Override
protected List<InlineMenuItem> createMenuItems() {
return createDefaultMenuItems(getModel());
}
// @Override
// protected List<InlineMenuItem> createMenuItems() {
// return createDefaultMenuItems(getModel());
// }
};
}
};
Expand Down
8 changes: 4 additions & 4 deletions ...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
View file
Expand Up @@ -138,10 +138,10 @@ protected void populateItem(final ListItem<FocusProjectionDto> item) {
protected Component createHeader(String id, IModel<ObjectWrapper<F>> model) {
return new CheckTableHeader(id, (IModel) model) {

@Override
protected List<InlineMenuItem> createMenuItems() {
return createDefaultMenuItems(getModel());
}
// @Override
// protected List<InlineMenuItem> createMenuItems() {
// return createDefaultMenuItems(getModel());
// }
};
}
};
Expand Down
1 change: 0 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.html
View file
Expand Up @@ -22,6 +22,5 @@
<h3 style="display: inline-block;" wicket:id="title"/>
<a wicket:id="showMore"><wicket:message key="H3Header.showMore"/></a>
</div>
<div class="col-xs-2 cog" wicket:id="menu"/>
</wicket:panel>
</html>
13 changes: 1 addition & 12 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.java
View file
Expand Up @@ -47,8 +47,7 @@ public class H3Header<O extends ObjectType> extends SimplePanel<ObjectWrapper<O>

private static final String ID_STATUS = "status";
private static final String ID_SHOW_MORE = "showMore";
private static final String ID_TITLE = "title";
private static final String ID_MENU = "menu";
public static final String ID_TITLE = "title";

public H3Header(String id, IModel<ObjectWrapper<O>> model) {
super(id, model);
Expand All @@ -68,16 +67,6 @@ public String getObject() {
add(title);

final IModel<List<InlineMenuItem>> items = new Model((Serializable) createMenuItems());
InlineMenu menu = new InlineMenu(ID_MENU, items);
menu.add(new VisibleEnableBehaviour() {

@Override
public boolean isVisible() {
List<InlineMenuItem> list = items.getObject();
return list != null && !list.isEmpty();
}
});
add(menu);

BootstrapLabel status = new BootstrapLabel(ID_STATUS, createStringResource("H3Header.label.error"),
new Model(BootstrapLabel.State.DANGER));
Expand Down
31 changes: 26 additions & 5 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.html
View file
Expand Up @@ -17,11 +17,32 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="visible" wicket:id="header">
<div class="container-name" wicket:id="label"/>
</div>
<div wicket:id="properties">
<div class="row" wicket:id="property"/>
<!--<div class="visible" wicket:id="header">-->
<!--<div class="container-name" wicket:id="label"/>-->
<!--</div>-->
<!--<div wicket:id="properties">-->
<!--<div class="row" wicket:id="property"/>-->
<!--</div>-->



<div class="box box-default">
<!--collapsed-box-->
<div class="box-header" style="margin-top: -10px">
<div class="visible" wicket:id="header">
<div class="col-xs-4 container-name" wicket:id="label"/>

<div class="box-tools pull-right">
<button wicket:id="showEmptyFields" class="btn btn-box-tool" data-widget="tooltip" data-original-title="Show empty fields"><i class="fa fa-arrows-alt"></i></button>
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
</div>
</div>
</div>
<div class="box-body">
<div wicket:id="properties">
<div class="row" wicket:id="property"/>
</div>
</div>
</div>
</wicket:panel>
</html>
35 changes: 30 additions & 5 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
View file
Expand Up @@ -24,6 +24,8 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;

import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
Expand All @@ -42,17 +44,20 @@
public class PrismContainerPanel extends Panel {

private static final Trace LOGGER = TraceManager.getTrace(PrismContainerPanel.class);

private static final String ID_SHOW_EMPTY_FIELDS = "showEmptyFields";

private boolean showHeader;
private boolean showEmptyFields;
private PageBase pageBase;

public PrismContainerPanel(String id, IModel<ContainerWrapper> model, Form form) {
this(id, model, true, form, null);
this(id, model, true, false, form, null);
}

public PrismContainerPanel(String id, final IModel<ContainerWrapper> model, boolean showHeader, Form form, PageBase pageBase) {
public PrismContainerPanel(String id, final IModel<ContainerWrapper> model, boolean showHeader, boolean showEmptyFields, Form form, PageBase pageBase) {
super(id);
this.showHeader = showHeader;
this.showEmptyFields = showEmptyFields;
this.pageBase = pageBase;

LOGGER.trace("Creating container panel for {}", model.getObject());
Expand Down Expand Up @@ -94,12 +99,32 @@ private void initLayout(final IModel<ContainerWrapper> model, final Form form) {

@Override
public boolean isVisible() {
return !model.getObject().isMain();
ContainerWrapper obj = model.getObject();
boolean boo = obj.isMain();
return true;
}
});


AjaxLink showEmptyFieldsButton = new AjaxLink(ID_SHOW_EMPTY_FIELDS) {
@Override
public void onClick(AjaxRequestTarget target) {
showEmptyFields = !showEmptyFields;
ContainerWrapper containerWrapper = model.getObject();
ObjectWrapper objectWrapper = containerWrapper.getObject();
objectWrapper.setShowEmpty(showEmptyFields);
target.add(PrismContainerPanel.this);
}
};
header.add(showEmptyFieldsButton);
add(header);

header.add(new Label("label", new PropertyModel<>(model, "displayName")));
PropertyModel headerLabelModel = new PropertyModel<>(model, "displayName");
Object displayName = headerLabelModel.getObject();
if (displayName != null){

}
header.add(new Label("label", headerLabelModel));

ListView<ItemWrapper> properties = new ListView<ItemWrapper>("properties",
new PropertyModel(model, "properties")) {
Expand Down
24 changes: 20 additions & 4 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
View file
Expand Up @@ -33,12 +33,28 @@
<div class="objectFormHeaderOperationButtons" wicket:id="operationButtons" />
</div>
</div>
<div class="row header" wicket:id="header"/>
<div wicket:id="body">
<div wicket:id="containers">
<div wicket:id="container"/>

<div class="box box-default" wicket:id="boxContainer">
<div class="box-header with-border" wicket:id="headerContainer">
<div wicket:id="headerLabel"/>
<div class="box-tools pull-right">
<!--<button wicket:id="showEmptyFields" class="btn btn-box-tool" data-widget="tooltip" data-original-title="Show empty fields"><i class="fa fa-arrows-alt"></i></button>-->
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
</div>
</div>
<div class="box-body" wicket:id="body">
<div wicket:id="containers">
<div wicket:id="container"/>
</div>
</div>
</div>


<!--<div wicket:id="body">-->
<!--<div wicket:id="containers">-->
<!--<div wicket:id="container"/>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
</wicket:panel>
Expand Down
67 changes: 50 additions & 17 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
View file
Expand Up @@ -35,6 +35,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
Expand Down Expand Up @@ -63,8 +64,11 @@
public class PrismObjectPanel<O extends ObjectType> extends Panel {

private static final String STRIPED_CLASS = "striped";
private static final String ID_HEADER = "header";

private static final String ID_HEADER_LABEL = "headerLabel";
private static final String ID_HEADER_CONTAINER = "headerContainer";
private static final String ID_BOX_CONTAINER = "boxContainer";
// private static final String ID_SHOW_EMPTY_FIELDS = "showEmptyFields";

private static final Trace LOGGER = TraceManager.getTrace(PrismObjectPanel.class);

private boolean showHeader = true;
Expand All @@ -75,7 +79,7 @@ public PrismObjectPanel(String id, IModel<ObjectWrapper<O>> model, ResourceRefer
setOutputMarkupId(true);

LOGGER.trace("Creating object panel for {}", model.getObject());

this.pageBase = pageBase;
initLayout(model, image, form);
}
Expand Down Expand Up @@ -175,15 +179,7 @@ public boolean isDisabled(ObjectWrapper wrapper) {
// }

protected Component createHeader(String id, IModel<ObjectWrapper<O>> model) {
H3Header header = new H3Header(id, model) {

@Override
protected List<InlineMenuItem> createMenuItems() {
return createDefaultMenuItems(getModel());
}
};

return header;
return new H3Header(id, model);
}

protected List<InlineMenuItem> createDefaultMenuItems(IModel<ObjectWrapper> model) {
Expand Down Expand Up @@ -249,8 +245,6 @@ public String getObject() {
}

private void initLayout(final IModel<ObjectWrapper<O>> model, ResourceReference image, final Form form) {
add(createHeader(ID_HEADER, model));

WebMarkupContainer headerPanel = new WebMarkupContainer("headerPanel");
headerPanel.add(new AttributeAppender("class", createHeaderClassModel(model), " "));
// TODO - attempt to fix row color application when certain actions performed, similar to AssignmentEditorPanel.
Expand All @@ -262,7 +256,7 @@ private void initLayout(final IModel<ObjectWrapper<O>> model, ResourceReference
@Override
public boolean isVisible() {
return isShowHeader();

}
});

Expand Down Expand Up @@ -293,7 +287,41 @@ public boolean isVisible() {

initButtons(headerPanel, model);

final WebMarkupContainer boxContainer = new WebMarkupContainer(ID_BOX_CONTAINER);
final WebMarkupContainer headerContainer = new WebMarkupContainer(ID_HEADER_CONTAINER);
final Component headerLabel = createHeader(ID_HEADER_LABEL, model);
headerContainer.add(new VisibleEnableBehaviour(){
@Override
public boolean isVisible() {
if (headerLabel instanceof H3Header){
Label headerTitle = (Label)headerLabel.get(H3Header.ID_TITLE);
if (headerTitle != null){
String displayName = headerTitle.getDefaultModelObjectAsString();
boolean isVisible = !(displayName == null || displayName.trim().equals(""));
if (!isVisible){
boxContainer.add(new AttributeModifier("class", ""));
}
return isVisible;
}
}
return true;
}
});
headerContainer.add(headerLabel);

// AjaxLink showEmptyFieldsButton = new AjaxLink(ID_SHOW_EMPTY_FIELDS) {
// @Override
// public void onClick(AjaxRequestTarget target) {
// ObjectWrapper wrapper = model.getObject();
// wrapper.setShowEmpty(!wrapper.isShowEmpty());
// target.add(PrismObjectPanel.this);
// }
// };
// headerContainer.add(showEmptyFieldsButton);
boxContainer.add(headerContainer);

WebMarkupContainer body = new WebMarkupContainer("body");
body.setVisible(true);
body.add(new VisibleEnableBehaviour() {

@Override
Expand All @@ -302,7 +330,9 @@ public boolean isVisible() {
return !wrapper.isMinimalized();
}
});
add(body);
body.setOutputMarkupPlaceholderTag(true);
boxContainer.add(body);
add(boxContainer);

ListView<ContainerWrapper> containers = new ListView<ContainerWrapper>("containers",
createContainerModel(model)) {
Expand All @@ -321,7 +351,10 @@ protected IModel<List<ContainerWrapper>> createContainerModel(IModel<ObjectWrapp
}

protected void createContainerPanel(ListItem<ContainerWrapper> item, Form form){
item.add(new PrismContainerPanel("container", item.getModel(), true, form, pageBase));
PrismContainerPanel panel = new PrismContainerPanel("container", item.getModel(), true,
item.getModelObject().getObject().isShowEmpty(), form, pageBase);
panel.setOutputMarkupPlaceholderTag(true);
item.add(panel);
}

protected IModel<String> createDisplayName(IModel<ObjectWrapper<O>> model) {
Expand Down
2 changes: 0 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
View file
Expand Up @@ -644,8 +644,6 @@ private MainMenuItem createUsersItems() {
// MenuItem search = new MenuItem(createStringResource("PageAdmin.menu.users.search"),
// PageUsersSearch.class);
// submenu.add(search);
MenuItem requestAssignment = new MenuItem(createStringResource("PageAdmin.menu.top.users.requestAssign"), PageAssignmentRequest.class);
submenu.add(requestAssignment);

return item;
}
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -1141,7 +1141,7 @@ pageAdminFocus.button.unlink=Unlink
pageAdminFocus.button.unlock=Unlock
pageAdminFocus.button.delete=Delete
pageAdminFocus.button.addToOrg=Add to organization
pageAdminFocus.focusDetails=Details
pageAdminFocus.focusDetails=
pageAdminFocus.projections=Projections
pageAdminFocus.organizations=Organizations
pageAdminFocus.assignments=Assignments
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
View file
Expand Up @@ -1126,7 +1126,7 @@ pageAdminFocus.button.unlink=Unlink
pageAdminFocus.button.unlock=Unlock
pageAdminFocus.button.delete=Delete
pageAdminFocus.button.addToOrg=Add to organization
pageAdminFocus.focusDetails=Details
pageAdminFocus.focusDetails=
pageAdminFocus.projections=Projections
pageAdminFocus.organizations=Organizations
pageAdminFocus.message.couldntCreateAccountNoSchema=Couldn't create projection form for '{0}', no refined schema available. Possible problem with connector configuration and/or connection. Please check logs for more information.
Expand Down

0 comments on commit 1c4aab9

Please sign in to comment.