Skip to content

Commit

Permalink
more html fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Oct 2, 2015
1 parent a9f6b30 commit 71fb1e0
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 37 deletions.
28 changes: 26 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
View file
Expand Up @@ -16,7 +16,7 @@

package com.evolveum.midpoint.web.component.data;

import com.evolveum.midpoint.web.component.data.paging.NavigatorPanel;
import com.evolveum.midpoint.prism.query.ObjectPaging;
import com.evolveum.midpoint.web.component.util.SimplePanel;
import com.evolveum.midpoint.web.session.UserProfileStorage;
import org.apache.wicket.MarkupContainer;
Expand Down Expand Up @@ -46,7 +46,7 @@ public class BoxedTablePanel<T> extends SimplePanel {
private static final String ID_PAGING = "paging";
private static final String ID_COUNT = "count";

public BoxedTablePanel(String id,ISortableDataProvider provider, List<IColumn<T, String>> columns,
public BoxedTablePanel(String id, ISortableDataProvider provider, List<IColumn<T, String>> columns,
UserProfileStorage.TableId tableId, int pageSize) {
super(id);

Expand Down Expand Up @@ -79,6 +79,25 @@ protected WebMarkupContainer createFooter(String footerId) {
return new PagingFooter(footerId, ID_PAGING_FOOTER, this, getTable());
}

public DataTable getDataTable() {
return (DataTable) get(ID_TABLE);
}

public void setCurrentPage(ObjectPaging paging) {
if (paging == null) {
getDataTable().setCurrentPage(0);
return;
}

long itemsPerPage = getDataTable().getItemsPerPage();
long page = ((paging.getOffset() + itemsPerPage) / itemsPerPage) - 1;
if (page < 0) {
page = 0;
}

getDataTable().setCurrentPage(page);
}

private static class PagingFooter extends Fragment {

public PagingFooter(String id, String markupId, MarkupContainer markupProvider, DataTable table) {
Expand Down Expand Up @@ -129,6 +148,11 @@ private String createCountString(IPageable pageable) {
}

if (count > 0) {
if (count == Integer.MAX_VALUE) {
return new StringResourceModel("CountToolbar.label", PagingFooter.this, null,
new Object[]{from, to}).getString();
}

return new StringResourceModel("CountToolbar.label", PagingFooter.this, null,
new Object[]{from, to, count}).getString();
}
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel.html
View file
Expand Up @@ -20,7 +20,7 @@
<div class="form-group">
<label class="col-lg-2 control-label"><wicket:message key="ImportOptionsPanel.options"/></label>

<div class="col-lg-8">
<div class="col-lg-10">
<div>
<label class="col-lg-2 checkbox-inline">
<input wicket:id="protectedByEncryption" type="checkbox" name="optionsRadios" checked>
Expand Down
8 changes: 4 additions & 4 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
View file
Expand Up @@ -447,15 +447,15 @@ private void userDetailsPerformed(AjaxRequestTarget target, String oid) {
setResponsePage(PageUser.class, parameters);
}

private TablePanel getTable() {
return (TablePanel) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));
private BoxedTablePanel getTable() {
return (BoxedTablePanel) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));
}

private void searchPerformed(AjaxRequestTarget target) {
ObjectQuery query = createQuery();
target.add(getFeedbackPanel());

TablePanel panel = getTable();
BoxedTablePanel panel = getTable();
DataTable table = panel.getDataTable();
ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
provider.setQuery(query);
Expand Down Expand Up @@ -710,7 +710,7 @@ private void updateActivationPerformed(AjaxRequestTarget target, boolean enablin
private void clearSearchPerformed(AjaxRequestTarget target){
model.setObject(new UsersDto());

TablePanel panel = getTable();
BoxedTablePanel panel = getTable();
DataTable table = panel.getDataTable();
ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
provider.setQuery(null);
Expand Down
66 changes: 37 additions & 29 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
View file
Expand Up @@ -28,43 +28,51 @@
</form>
</div>
<div class="col-md-4">
<div wicket:id="treeHeader" class="row" style="margin: 0; border-bottom: 1px solid #ddd;">
<div class="col-xs-9" style="padding-left: 5px;">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.hierarchy"/>
<div class="box box-default">
<div class="box-body">
<div wicket:id="treeHeader" class="row" style="margin: 0; border-bottom: 1px solid #ddd;">
<div class="col-xs-9" style="padding-left: 5px;">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.hierarchy"/>
</div>
</div>
<div class="col-xs-3 cog" style="padding-right: 5px; margin-top: 2px;" wicket:id="treeMenu" about="treeMenu"/>
</div>
</div>
<div class="col-xs-3 cog" style="padding-right: 5px; margin-top: 2px;" wicket:id="treeMenu" about="treeMenu"/>
</div>

<div wicket:id="treeContainer" class="org-tree-container">
<div wicket:id="tree"/>
<div wicket:id="treeContainer" class="org-tree-container">
<div wicket:id="tree"/>
</div>
</div>
</div>
</div>
<div class="col-md-8">
<form class="clearfix form-horizontal" wicket:id="form">
<div wicket:id="childOrgContainer">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.childOrg"/>
</div>
<div wicket:id="childUnitTable" about="childUnitTable"/>
</div>
<div class="box box-success">
<div class="box-body">
<form class="clearfix form-horizontal" wicket:id="form">
<div wicket:id="childOrgContainer">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.childOrg"/>
</div>
<div wicket:id="childUnitTable" about="childUnitTable"/>
</div>

<div wicket:id="managerContainer">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.managers"/>
</div>
<div wicket:id="managerTable"/>
</div>
<div wicket:id="managerContainer">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.managers"/>
</div>
<div wicket:id="managerTable"/>
</div>

<div wicket:id="memberContainer">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.members"/>
</div>
<div wicket:id="memberTable"/>
</div>
<div wicket:id="memberContainer">
<div class="tree-table-header">
<wicket:message key="TreeTablePanel.members"/>
</div>
<div wicket:id="memberTable"/>
</div>

</form>
</form>
</div>
</div>
</div>
</div>
</wicket:panel>
10 changes: 10 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
View file
Expand Up @@ -42,6 +42,7 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.component.data.BaseSortableDataProvider;
import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
import com.evolveum.midpoint.web.component.data.TablePanel;
import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
Expand Down Expand Up @@ -467,8 +468,17 @@ public static void encryptProtectedString(ProtectedStringType string, boolean en
}
}

public static <T extends Selectable> List<T> getSelectedData(BoxedTablePanel panel) {
DataTable table = panel.getDataTable();
return getSelectedData(table);
}

public static <T extends Selectable> List<T> getSelectedData(TablePanel panel) {
DataTable table = panel.getDataTable();
return getSelectedData(table);
}

private static <T extends Selectable> List<T> getSelectedData(DataTable table) {
BaseSortableDataProvider<T> provider = (BaseSortableDataProvider<T>) table.getDataProvider();

List<T> selected = new ArrayList<T>();
Expand Down
3 changes: 2 additions & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -2723,4 +2723,5 @@ PageTemplate.toggleNavigation=Toggle navigation
PageTemplate.user=user
PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason: {0}
SystemInfoPanel.starttime=Start time
SystemInfoPanel.uptime=Uptime
SystemInfoPanel.uptime=Uptime
CountToolbar.label.unknownCount=Displaying {0,number,integer} to {1,number,integer}, unknown number of matching results.

0 comments on commit 71fb1e0

Please sign in to comment.