Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Style changes to the new Iteration page.
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Munoz committed Mar 16, 2012
1 parent dad0f31 commit da70bd1
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 221 deletions.
103 changes: 0 additions & 103 deletions server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
View file

This file was deleted.

10 changes: 5 additions & 5 deletions server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
View file
Expand Up @@ -71,13 +71,13 @@
</rule>

<rule>
<from casesensitive="true">^/iteration/view/([^/]+)/([^/]+)/files/([^/]+)/?$</from>
<from casesensitive="true">^/iteration/files/([^/]+)/([^/]+)/([^/]+)/?$</from>
<to last="true">/iteration/files.seam\?project=$1&amp;iteration=$2&amp;localeId=$3</to>
</rule>

<rule>
<from casesensitive="true">^/iteration/edit(.+)?$</from>
<to last="true">/iteration/edit.seam?$1</to>
<from casesensitive="true">^/iteration/edit/([^/]+)/(.+)$</from>
<to last="true">/iteration/edit.seam\?projectSlug=$1&amp;slug=$2</to>
</rule>

<!-- zanata.xml -->
Expand Down Expand Up @@ -259,10 +259,10 @@
</outbound-rule>
<outbound-rule>
<from>^(/.+)?/iteration/files.seam\?project=([^&amp;]+)&amp;iteration=([^&amp;]+)&amp;localeId=([^&amp;]+)$</from>
<to>$1/iteration/view/$2/$3/files/$4</to>
<to>$1/iteration/files/$2/$3/$4</to>
</outbound-rule>
<outbound-rule>
<from>^(/.+)?/iteration/edit.seam\?projectSlug=([^&amp;]+)&amp;iterationSlug=([^&amp;]+)$</from>
<from>^(/.+)?/iteration/edit.seam\?projectSlug=([^&amp;]+)&amp;slug=([^&amp;]+)$</from>
<to>$1/iteration/edit/$2/$3</to>
</outbound-rule>
<outbound-rule>
Expand Down
78 changes: 0 additions & 78 deletions server/zanata-war/src/main/webapp/project/iteration_status.xhtml
View file

This file was deleted.

58 changes: 27 additions & 31 deletions server/zanata-war/src/main/webapp/project/project.xhtml
View file
Expand Up @@ -38,45 +38,41 @@

<s:fragment rendered="#{projectHome.activeIterations.size > 0}">
<h2>#{messages['jsf.ActiveVersions']}</h2>
<rich:dataGrid id="activeIterations" columns="1"
value="#{projectHome.activeIterations}"
var="_iteration"
rowKeyVar="_it" >
<rich:simpleTogglePanel switchType="client" label="#{_iteration.slug}" headerClass="iterationHeader_active">
<s:link view="/iteration/iteration.xhtml" propagation="none" value="#{messages['jsf.project.ViewIteration']}" styleClass="iteration_detail_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
</s:link>
</rich:simpleTogglePanel>
</rich:dataGrid>
<div class="iterations">
<ui:repeat value="#{projectHome.activeIterations}" var="_iteration">
<a href="#{request.contextPath}/iteration/view/#{projectHome.instance.slug}/#{_iteration.slug}">
<div>
<h:outputText value="#{_iteration.slug}"/>
</div>
</a>
</ui:repeat>
</div>
</s:fragment>

<s:fragment rendered="#{projectHome.readOnlyIterations.size > 0}">
<h2>#{messages['jsf.ReadOnlyVersions']}</h2>
<rich:dataGrid id="readOnlyIterations" columns="1"
value="#{projectHome.readOnlyIterations}"
var="_iteration">
<rich:simpleTogglePanel switchType="client" label="#{_iteration.slug}" headerClass="iterationHeader_readOnly" opened="#{false}">
<s:link view="/iteration/iteration.xhtml" propagation="none" value="#{messages['jsf.project.ViewIteration']}" styleClass="iteration_detail_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
</s:link>
</rich:simpleTogglePanel>
</rich:dataGrid>
<div class="iterations">
<ui:repeat value="#{projectHome.readOnlyIterations}" var="_iteration">
<a href="#{request.contextPath}/iteration/view/#{projectHome.instance.slug}/#{_iteration.slug}">
<div>
<h:outputText value="#{_iteration.slug}"/>
</div>
</a>
</ui:repeat>
</div>
</s:fragment>

<s:fragment rendered="#{projectHome.obsoleteIterations.size > 0 and projectIterationAction.checkViewObsolete()}">
<h2>#{messages['jsf.ObsoleteVersions']}</h2>
<rich:dataGrid id="obsoleteIterations" columns="1"
value="#{projectHome.obsoleteIterations}"
var="_iteration">
<rich:simpleTogglePanel switchType="client" label="#{_iteration.slug}" headerClass="iterationHeader_obsolete" opened="#{false}">
<s:link view="/iteration/iteration.xhtml" propagation="none" value="#{messages['jsf.project.ViewIteration']}" styleClass="iteration_detail_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
</s:link>
</rich:simpleTogglePanel>
</rich:dataGrid>
<div class="iterations">
<ui:repeat value="#{projectHome.obsoleteIterations}" var="_iteration">
<a href="#{request.contextPath}/iteration/view/#{projectHome.instance.slug}/#{_iteration.slug}">
<div>
<h:outputText value="#{_iteration.slug}"/>
</div>
</a>
</ui:repeat>
</div>
</s:fragment>

</s:decorate>
Expand Down
16 changes: 12 additions & 4 deletions server/zanata-war/src/main/webapp/stylesheet/zanata.css
View file
Expand Up @@ -581,6 +581,18 @@ a.action_link:hover {

/* ----------------------- Project iteration CSS -------------------------*/

.iterations div {
list-style: none;
padding: 5px 5px 5px 5px;
margin-bottom: 3px;
border-color: black;
border-radius: 3px 3px 3px 3px;
}

.iterations div:hover {
background-color: lightgray;
}

.iterationHeader_active {
background-image: none;
border-width: medium;
Expand Down Expand Up @@ -629,10 +641,6 @@ a.action_link:hover {
.highlighted_datatable_row {
background-color: lightYellow;
}

a.iteration_detail_link {
float: right;
}
/* ----------------------- End Inline project iteration CSS -------------------------*/

.iteration_inline_tribes {
Expand Down

0 comments on commit da70bd1

Please sign in to comment.