Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: gpuliyar/oss-scrum
base: 3a22765ff0
...
head fork: gpuliyar/oss-scrum
compare: 1c197bb11d
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
6 pom.xml
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -102,9 +102,9 @@
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
- <version>3.4.1</version>
+ <version>3.4.2</version>
</dependency>
-
+
<dependency>
<groupId>org.primefaces.themes</groupId>
<artifactId>bootstrap</artifactId>
View
59 src/main/webapp/app/administrator/module/manage-organizations.xhtml
@@ -7,36 +7,43 @@
xmlns:p="http://primefaces.org/ui">
<h:form id="administrator-manage-organizations">
- <p:toolbar>
- <p:toolbarGroup align="left">
- <p:commandButton id="new-organization-commandbutton" type="button" value="New" icon="ui-icon-document" />
- </p:toolbarGroup>
-
- <p:toolbarGroup align="right">
- <p:menuButton value="Export...">
- <p:menuitem value="as PDF" icon="ui-icon-document" />
- <p:menuitem value="as Excel" icon="ui-icon-document" />
- <p:menuitem value="as CSV" title="Comma separated value file." icon="ui-icon-document" />
- </p:menuButton>
- </p:toolbarGroup>
-
- </p:toolbar>
-
<p:dataTable id="organization-datatable"
value="#{organizationManagedBean.organizations}"
var="organization"
editable="true"
widgetVar="organizationDatatable"
emptyMessage="No organizations found."
- filteredValue="#{organizationManagedBean.filteredOrganizations}">
+ filteredValue="#{organizationManagedBean.filteredOrganizations}"
+ draggableColumns="true"
+ styleClass="datatable-header-toolbar"
+ paginator="true"
+ rows="10"
+ paginatorTemplate="{FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink}">
<f:facet name="header">
- <p:outputPanel>
- <p:inputText styleClass="pull-right" onkeyup="organizationDatatable.filter()" />
- </p:outputPanel>
+ <p:toolbar>
+ <p:toolbarGroup>
+ <div class="row-fluid">
+ <div class="span4">
+ <p:toolbarGroup align="left">
+ <p:commandButton styleClass="pull-left" id="new-organization-commandbutton" type="button" value="New" icon="ui-icon-document" />
+ <p:commandButton value="Export as XML...">
+ <p:dataExporter type="xml" target="organization-datatable" fileName="organizations" />
+ </p:commandButton>
+ </p:toolbarGroup>
+ </div>
+ <div class="span4">
+
+ </div>
+ <div class="span4">
+ <!--<p:inputText id="globalFilter" styleClass="pull-right" onkeyup="organizationDatatable.filter()" />-->
+ </div>
+ </div>
+ </p:toolbarGroup>
+ </p:toolbar>
</f:facet>
- <p:column headerText="id" sortBy="#{organization.id}" filterBy="#{organization.id}">
+ <p:column headerText="id" sortBy="#{organization.id}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{organization.id}" />
@@ -47,7 +54,7 @@
</p:cellEditor>
</p:column>
- <p:column headerText="name" sortBy="#{organization.name}" filterBy="#{organization.name}">
+ <p:column headerText="name" sortBy="#{organization.name}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{organization.name}" />
@@ -58,7 +65,7 @@
</p:cellEditor>
</p:column>
- <p:column headerText="code" sortBy="#{organization.code}" filterBy="#{organization.code}">
+ <p:column headerText="code" sortBy="#{organization.code}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{organization.code}" />
@@ -69,7 +76,7 @@
</p:cellEditor>
</p:column>
- <p:column headerText="description" sortBy="#{organization.description}" filterBy="#{organization.description}">
+ <p:column headerText="description" sortBy="#{organization.description}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{organization.description}" />
@@ -80,7 +87,7 @@
</p:cellEditor>
</p:column>
- <p:column headerText="action" sortBy="#{organization.action}" filterBy="#{organization.action}">
+ <p:column headerText="action" sortBy="#{organization.action}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{organization.action}" />
@@ -91,7 +98,7 @@
</p:cellEditor>
</p:column>
- <p:column headerText="status" sortBy="#{organization.status}" filterBy="#{organization.status}">
+ <p:column headerText="status" sortBy="#{organization.status}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{organization.status}" />
@@ -111,7 +118,7 @@
</p:dataTable>
</h:form>
- <p:overlayPanel my="left bottom" id="new-organization-overlaypanel" for="administrator-manage-organizations:new-organization-commandbutton" hideEffect="fade">
+ <p:overlayPanel my="left bottom" id="new-organization-overlaypanel" for="administrator-manage-organizations:organization-datatable:new-organization-commandbutton" hideEffect="fade">
<h:form styleClass="form-horizontal dropdown-form">
<legend>Create new organization</legend>
<div class="control-group">
View
9 src/main/webapp/resources/less/override/vendor/jqueryui/jqueryui-overrides.less
@@ -11,4 +11,13 @@
.ui-cell-editor-input input {
width: 118px;
+}
+.ui-datatable.datatable-header-toolbar {
+ .ui-datatable-header {
+ padding: 0;
+ }
+
+ .ui-toolbar .ui-toolbar-group-left, .ui-toolbar .ui-toolbar-group-right {
+ float: none;
+ }
}
View
7 src/main/webapp/resources/less/style.css
@@ -9292,6 +9292,13 @@ body {
.ui-cell-editor-input input {
width: 118px;
}
+.ui-datatable.datatable-header-toolbar .ui-datatable-header {
+ padding: 0;
+}
+.ui-datatable.datatable-header-toolbar .ui-toolbar .ui-toolbar-group-left,
+.ui-datatable.datatable-header-toolbar .ui-toolbar .ui-toolbar-group-right {
+ float: none;
+}
.ui-selectonebutton input {
display: none;
}

No commit comments for this range

Something went wrong with that request. Please try again.