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

Commit

Permalink
Browse files Browse the repository at this point in the history
Work in progress: https://bugzilla.redhat.com/show_bug.cgi?id=844819
  • Loading branch information
Alex Eng committed Aug 8, 2012
1 parent 34afe68 commit f31d79e
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 79 deletions.
Binary file added zanata-war/src/main/resources/images/zanata-icon/16x16/chevron-right.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zanata-war/src/main/resources/images/zanata-icon/16x16/house.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zanata-war/src/main/resources/images/zanata-icon/16x16/signin.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zanata-war/src/main/resources/images/zanata-icon/16x16/signout.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zanata-war/src/main/resources/images/zanata-icon/16x16/user.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
View file
Expand Up @@ -8,11 +8,11 @@

<h:form>
<s:link view="/home.xhtml" propagation="none" rendered="#{not empty breadcrumbs.locations}">
<img src="#{requestContextPath}/images/HouseBlack.png" alt="#{messages['jsf.ZanataMainDescription']}" style="width:12px;"/>
<img src="#{requestContextPath}/images/zanata-icon/16x16/house.png" alt="#{messages['jsf.ZanataMainDescription']}" style="width:14px;"/>
</s:link>

<ui:repeat value="#{breadcrumbs.locations}" var="breadcrumb" styleClass="breadcrumbs">
<img src="/zanata/images/seperator.png"/>
<img src="/zanata/images/zanata-icon/16x16/chevron-right.png"/>
<s:link value="#{breadcrumb.display}" view="#{breadcrumb.location}" styleClass="breadcrumbs_link" rendered="#{not empty breadcrumb.location}"/>
<s:span styleClass="breadcrumbs_display" rendered="#{empty breadcrumb.location}">#{breadcrumb.display}</s:span>
</ui:repeat>
Expand Down
86 changes: 69 additions & 17 deletions zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
View file
Expand Up @@ -65,11 +65,13 @@
<ul>
<li>
<s:link id="MyProfile" view="/profile/view.xhtml" propagation="none">
<img src="#{request.contextPath}/images/crystal_project/_16x16/actions/kuser.png" />#{messages['jsf.MyProfile']}
<img src="#{request.contextPath}/images/zanata-icon/16x16/user.png" />#{messages['jsf.MyProfile']}
</s:link>
</li>
<li>
<s:link id="Sign_out" view="/account/sign_out" value="#{messages['jsf.SignOut']}" propagation="none" />
<s:link id="Sign_out" view="/account/sign_out" propagation="none">
<img src="#{requestContextPath}/images/zanata-icon/16x16/signout.png" alt="#{messages['jsf.ZanataMainDescription']}"/>#{messages['jsf.SignOut']}
</s:link>
</li>
</ul>
</div>
Expand All @@ -80,11 +82,9 @@
<div class="submenu">
<ul>
<li>
<s:link id="Sign_in" view="/account/sign_in?continue=#{urlUtil.getEncodedLocalUrl(request)}" value="#{messages['jsf.SignIn']}" propagation="none" />

<s:fragment rendered="#{not applicationConfiguration.internalAuth}">
<a href="#{applicationConfiguration.registerPath}">#{messages['jsf.Register']}</a>
</s:fragment>
<s:link id="Sign_in" view="/account/sign_in?continue=#{urlUtil.getEncodedLocalUrl(request)}" propagation="none">
<img src="#{requestContextPath}/images/zanata-icon/16x16/signin.png" alt="#{messages['jsf.ZanataMainDescription']}"/>#{messages['jsf.SignIn']}
</s:link>
</li>

<li>
Expand Down Expand Up @@ -163,19 +163,71 @@
</div>

<div class="footer">
<div>
<a href="http://zanata.org/">#{messages['jsf.Zanata']}</a> #{messages['jsf.RunningVersionInfo']} <br/>
&#169; #{messages['jsf.CopyrightYearInfo']} <a href="http://www.redhat.com/">#{messages['jsf.ManufacturerInfo']}</a> #{messages['jsf.AndOthers']}
<div class="footer_container">
<div class="section_block">
<h4>Zanata</h4>
<div class="content">
<ul>
<li>
<a href="http://zanata.org/">About Zanata</a>
</li>
<li>
<a href="http://zanata.org/documentation.html">Documentation</a>
</li>
<li>
<a href="https://github.com/zanata/zanata/wiki">Zanata Wiki</a>
</li>
<li>
<a href="http://blog-zanatatm.rhcloud.com/">Blog</a>
</li>
</ul>
</div>
</div>

<div class="section_block">
<h4>Support</h4>
<div class="content">
<ul>
<li>
<s:link view="/help/view.xhtml" propagation="none">#{messages['jsf.Help']}</s:link>
</li>
<li>
<a href="http://webchat.freenode.net/?channels=zanata">IRC Help</a>
</li>
<li>
<a href="http://zanata.org/faq.html">FAQ</a>
</li>
</ul>
</div>
</div>

<div id="localeSelector">
<h:form id="localeSelector_form">
<h:selectOneMenu id="Select"
value="#{localeSelector.localeString}" valueChangeListener="#{localeSelector.select}" onchange="submit()" >
<f:selectItems value="#{localeSelector.supportedLocales}"/>
</h:selectOneMenu>
</h:form>
<div class="section_block">
<h4>Issues</h4>
<div class="content">
<ul>
<li>
<a href="https://bugzilla.redhat.com/enter_bug.cgi?format=guided&amp;product=Zanata">#{messages['jsf.ReportAProblem']}</a>
</li>
<li>
<a href="https://bugzilla.redhat.com/buglist.cgi?product=Zanata&amp;bug_status=__open__">Known issues</a>
</li>
</ul>
</div>
</div>
<div class="locale_selector_block">
<h:form id="localeSelector_form">
<h:selectOneMenu id="Select"
value="#{localeSelector.localeString}" valueChangeListener="#{localeSelector.select}" onchange="submit()" >
<f:selectItems value="#{localeSelector.supportedLocales}"/>
</h:selectOneMenu>
</h:form>
</div>
<div style="clear:both;display:block;"/>
<div class="copyright_block">
<a href="http://zanata.org/">#{messages['jsf.Zanata']}</a> #{messages['jsf.RunningVersionInfo']}
&#169; #{messages['jsf.CopyrightYearInfo']} <a href="http://www.redhat.com/">#{messages['jsf.ManufacturerInfo']}</a> #{messages['jsf.AndOthers']}
</div>
</div>
</div>
<s:fragment rendered="#{not empty applicationConfiguration.piwikUrl and not empty applicationConfiguration.piwikIdSite}">
<!-- Piwik --> <script type="text/javascript">
Expand Down
33 changes: 14 additions & 19 deletions zanata-war/src/main/webapp/stylesheet/2.0.css
View file
Expand Up @@ -248,22 +248,15 @@
margin-bottom: 18px;
}

/* Copy of rich table styles */
.rich-table {
.rich-table {
width: 100%;
}

.rich-table { /*border-top: solid 1px silver;
border-left: solid 1px silver;*/
/*background-color: #E8EDFF;*/
background-color: #EEE;
empty-cells: show;
border-collapse: collapse;
border-radius: 5px;
border:0;
background-color:#EEEEEE;
}

.rich-table tbody tr:hover {
background-color: white;
background-color: #FFFFFF;
}

table {
Expand All @@ -284,16 +277,17 @@ table {

.rich-table-subheader th:last-child {
border-top-right-radius: 5px;
border-right:0;
}

.rich-table-subheadercell { /*border-right: solid 1px silver;*/
padding: 8px 8px 8px 8px;
.rich-table-subheadercell {
padding: 15px 8px 15px 8px;
text-align: center;
font-size: 11px;
/*color: black;*/
font-size: 13px;
color: #ffffff;
font-family: Arial, Verdana, sans-serif;
white-space: nowrap;
background-color:#461446;
}

th {
Expand All @@ -306,12 +300,13 @@ th,td {
padding: 0px;
}

.rich-table-cell { /*border-right: solid 1px silver;
border-bottom: solid 1px silver;*/
padding: 8px 8px 8px 8px;
.rich-table-cell {
padding: 10px;
font-size: 11px;
color: black;
color: #595959;
font-family: Arial, Verdana, sans-serif;
border-left:0;
border-right:0;
}
/* End of richfaces table styles */

Expand Down
98 changes: 57 additions & 41 deletions zanata-war/src/main/webapp/stylesheet/zanata.css
View file
Expand Up @@ -4,17 +4,12 @@
margin-right: auto;
margin-top:5px;
background-color: #ffffff;
}

#localeSelector {
float: left;
width: 100px;
min-height:400px;
}

#yui-main {
float: left;
width: 680px !important;
margin-bottom:55px;
}

.bold-larger {
Expand All @@ -27,7 +22,7 @@
}

#search_panel {
float: left;
float: right;
}

#breadcrumbs_panel
Expand All @@ -37,8 +32,9 @@

#breadcrumbs_panel img
{
width:6px;
width:10px;
padding:0 5px;
vertical-align:middle;
}

#breadcrumbs_div
Expand All @@ -53,7 +49,8 @@ a.breadcrumbs_link
font-size:14px;
font-weight:bold;
color:#0085CC;
padding:2px;
padding:2px 0 2px 5px;
vertical-align:middle;
}

a.breadcrumbs_link:hover
Expand All @@ -66,7 +63,8 @@ a.breadcrumbs_link:hover
font-size:14px;
font-weight:bold;
color:#B62918;
padding:2px;
padding:2px 0 2px 5px;
vertical-align:middle;
}


Expand Down Expand Up @@ -222,12 +220,11 @@ input[type="submit"].projectSearchButton
font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;
font-weight: bold;
font-size: 13px;
padding: 6px 5px 5px;
vertical-align:top;
text-align: center;
text-decoration: none;
color: white;
text-shadow: 0 1px 2px #114A1E, 0 1px 0 #114A1E;
margin-top:2px;
}

input[type="submit"].projectSearchButton:hover
Expand Down Expand Up @@ -331,11 +328,11 @@ input[type="text"].api_key

a.table_link {
font-size: 14px;
font-weight: bold;
font-weight:bold;
padding: 4px;
border-radius: 5px;
color: #7092C3;
text-decoration: none;
color: #454545;
text-decoration: underline;
text-align: right;
outline:none;
}
Expand Down Expand Up @@ -448,41 +445,25 @@ a.readonly_link,a.readonly_link:visited,a.readonly_link:link {
/* ----------------------- End Header CSS -------------------------*/

/* ----------------------- Footer CSS -------------------------*/
#ft {
background: url('../images/footer_background.png') 0 0 repeat-x;
-moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
float: left;
}

#footer {
width: 100%;
line-height: 20px;
text-align: center;
padding-top: 10px;
}

#footer-text {
float: left;
margin-left: 100px;
width: 700px;
.footer div.footer_container
{
width:800px;
margin-left:auto;
margin-right:auto;
display:block;
}

.footer
{
width: 100%;
height: 34px;
background: #DDD;
position:fixed;
bottom:0px;
color:#777777;
text-align:center;
font-weight:bold;
font-size:13px;
padding:3px;

float:left;
margin-top:10px;
}

.footer a
Expand All @@ -497,16 +478,51 @@ a.readonly_link,a.readonly_link:visited,a.readonly_link:link {
color:#FBB117;
}

.footer #localeSelector {
.footer .locale_selector_block {
float: right;
padding-top:7px;
}

.footer .copyright_block
{
margin-bottom:5px;
}

.footer div
{
display:inline-table;
}

.footer div.section_block
{
padding-right:40px;
vertical-align:top;
}

.footer div.section_block h4
{
margin-top:10px;
margin-bottom:5px;
color:#777;
}

.footer div.content a
{
font-size:11px;
}

.footer div.content ul
{
list-style-type:none;
font-size:12px;
padding:0;
margin-top:5px;
}

.footer div.content ul li
{
padding-bottom:5px;
}

/* ----------------------- End Footer CSS -------------------------*/

/* ----------------------- Loading Frame CSS (loading.xhtml) -------------------------*/
Expand Down

0 comments on commit f31d79e

Please sign in to comment.