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: 5730b665b0
...
head fork: gpuliyar/oss-scrum
compare: e17fba572d
  • 3 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
2  pom.xml
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
- <version>3.1.1</version>
+ <version>3.4.1</version>
</dependency>
<!-- Hibernate library -->
View
5 src/main/webapp/WEB-INF/ui/fragments/header.xhtml
@@ -57,7 +57,7 @@
<div class="span8">
<div class="control-group">
<div class="controls">
- <input type="submit" class="btn btn-block btn-primary">Sign in</input>
+ <input type="submit" class="btn btn-block btn-primary" value="Sign in"></input>
</div>
</div>
</div>
@@ -78,8 +78,7 @@
<ul class="nav">
<li><a href="#"><i class="icon-home"></i> Home</a></li>
<li><a href="#"><i class="icon-money"></i> Pricing</a></li>
- <li><a href="#"><i class="icon-shopping-cart"></i> Applications</a></li>
- <li><a href="#"><i class="icon-cogs"></i> Solutions</a></li>
+ <li><a href="#"><i class="icon-question-sign"></i> Help</a></li>
</ul>
</div>
</div>
View
18 src/main/webapp/WEB-INF/ui/layouts/layout-application.xhtml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE composition>
+<ui:composition xmlns:ui="http://java.sun.com/jsf/facelets"
+ template="layout-base.xhtml">
+
+ <ui:define name="layout-base">
+ <div class="row-fluid">
+ <div class="span3">
+ <ui:insert name="layout-application-sidebar"></ui:insert>
+ </div>
+
+ <div class="span9">
+ <ui:insert name="layout-application-main"></ui:insert>
+ </div>
+ </div>
+ </ui:define>
+
+</ui:composition>
View
14 src/main/webapp/WEB-INF/ui/layouts/layout-site.xhtml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE composition>
+<ui:composition xmlns:ui="http://java.sun.com/jsf/facelets"
+ template="layout-base.xhtml">
+
+ <ui:define name="layout-base">
+ <div class="row-fluid">
+ <div class="span12">
+ <ui:insert name="layout-site"></ui:insert>
+ </div>
+ </div>
+ </ui:define>
+
+</ui:composition>
View
7 src/main/webapp/app/home.xhtml
@@ -1,13 +1,16 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE composition>
-<ui:composition template="./../WEB-INF/ui/layouts/layout-app.xhtml"
+<ui:composition template="./../WEB-INF/ui/layouts/layout-application.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://primefaces.org/ui"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
- <ui:define name="layout-app">
+ <ui:define name="layout-application-sidebar">
+ </ui:define>
+
+ <ui:define name="layout-application-main">
<ui:include src="product/product.xhtml"></ui:include>
</ui:define>
View
8 src/main/webapp/app/product/product.xhtml
@@ -10,19 +10,19 @@
<p:tabView styleClass="row-fluid main-navigation" dynamic="true" cache="true">
<p:tab titleStyleClass="span3 nav-icon product-backlog" title="#{i18n['application.navigation.pills.product-backlog']}" >
- <ui:include src="/app/module/product-backlog.xhtml"></ui:include>
+ <ui:include src="module/product-backlog.xhtml"></ui:include>
</p:tab>
<p:tab titleStyleClass="span3 nav-icon resource-allocation" title="#{i18n['application.navigation.pills.resource-allocation']}">
- <ui:include src="/app/module/resource-allocation.xhtml"></ui:include>
+ <ui:include src="module/resource-allocation.xhtml"></ui:include>
</p:tab>
<p:tab titleStyleClass="span3 nav-icon burn-down" title="#{i18n['application.navigation.pills.burn-down']}">
- <ui:include src="/app/module/burn-down.xhtml"></ui:include>
+ <ui:include src="module/burn-down.xhtml"></ui:include>
</p:tab>
<p:tab titleStyleClass="span3 nav-icon reports" title="#{i18n['application.navigation.pills.reports']}">
- <ui:include src="/app/module/reports.xhtml"></ui:include>
+ <ui:include src="module/reports.xhtml"></ui:include>
</p:tab>
</p:tabView>
View
17 src/main/webapp/index.xhtml
@@ -1,26 +1,17 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE composition>
-<ui:composition template="./WEB-INF/ui/layouts/layout-base.xhtml"
+<ui:composition template="./WEB-INF/ui/layouts/layout-site.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui">
- <ui:define name="layout-home">
-
+ <ui:define name="layout-site">
<div class="hero-unit">
- <div class="row-fluid">
- <div class="span3">
- </div>
- <div class="span9">
- <h2><i class="icon icon-camera"></i> <h:outputText value="#{i18n['global.title']}" /></h2>
- <p><h:outputText value="#{i18n['global.description']}"/></p>
- <p:colorPicker/>
- </div>
- </div>
+ <h2><i class="icon icon-cogs"></i><h:outputText value=" " /><h:outputText value="#{i18n['global.title']}" /></h2>
+ <p><h:outputText value="#{i18n['global.description']}"/></p>
</div>
-
</ui:define>
</ui:composition>

No commit comments for this range

Something went wrong with that request. Please try again.