Skip to content
Browse files

style issue transaction fees report

git-svn-id: file:///svn/fedena2.1/branches/fedena2.1_i18n@1944 1b8ff446-76f8-11e0-a33c-ba5893e5f458
  • Loading branch information...
1 parent 470771d commit 07834eef3a3f2c6c183c4f289eca47c7c4717f05 @foradian foradian committed
View
32 app/views/finance/fees_report.html.erb
@@ -18,7 +18,7 @@
#under the License. -%>
<div id="content-header">
-<%= image_tag("/images/show_finance.png") %>
+ <%= image_tag("/images/show_finance.png") %>
<h1><%= t('finance_transactions')%></h1>
<h3><%= t('fees_report') %></h3>
<div id="app-back-button">
@@ -33,23 +33,23 @@
<div id="fees-table">
<div class="fees-th">
<div class="fees-table-head-desc"><%= t('description') %></div>
- <div class="fees-table-expenses"><%= t('amount') %></div>
+ <div class="fees-table-expenses1"><%= t('amount') %></div>
</div>
- <% @fee_collection.each do |c| %>
+ <% @fee_collection.each do |c| %>
<div class="list<%=cycle('odd', 'even')%>">
- <div class="fees-table-description"><%= link_to c.batch.full_name+" ( "+ shorten_string(c.name,27)+" ) ", :action => 'batch_fees_report',:id =>c.id,:start => @start_date,:end => @end_date %></div>
- <% amount = c.transaction_total(@start_date,@end_date) %>
- <div class="fees-table-income"> <%= amount %> </div>
- </div>
- <% total += amount %>
- <% end %>
+ <div class="fees-table-description"><%= link_to c.batch.full_name+" ( "+ c.name+" ) ", :action => 'batch_fees_report',:id =>c.id,:start => @start_date,:end => @end_date %></div>
+ <% amount = c.transaction_total(@start_date,@end_date) %>
+ <div class="fees-table-income"> <%= amount %> </div>
+ </div>
+ <% total += amount %>
+ <% end %>
- <br/>
- <div class="fees-th">
- <div class="fees-table-description"><%= t('total_fees') %></div>
- <div class="fees-table-expenses"><%= total %></div>
- </div>
+ <br/>
+ <div class="fees-th">
+ <div class="fees-table-description"><%= t('total_fees') %></div>
+ <div class="fees-table-expenses"><%= total %></div>
+ </div>
- </div>
-</div>
+ </div>
+ </div>
View
41 public/stylesheets/finance/fees_report.css
@@ -7,8 +7,8 @@
font-weight: normal;
height: 1.5em;
list-style-type: none;
- padding: 0.5em 0 0 1em;
- width: 600px;
+ padding: 0.5em 0 1em;
+ width: 100%;
}
.fees-tr {
background-color: #E7EEFF;
@@ -16,12 +16,11 @@
font-size:0.9em;
height: 1.5em;
padding: 0.5em 0 0 0;
- width:600px;
+ width:100%;
}
.fees-table-description {
- float:left;
+ width:700px;
padding: 0 0 0 60px;
- width: 321px;
color: #444444;
}
@@ -31,18 +30,30 @@
width: 317px;
}
.fees-table-expenses {
- float:left;
+ float:right;
+ width: 80px;
+ padding: 0 0 0 77px;
+ text-align:right;
+ color: #444444;
+ padding-right: 38px;
+ margin-top: -19px;
+}
+.fees-table-expenses1 {
+ float:right;
width: 80px;
padding: 0 0 0 77px;
text-align:right;
color: #444444;
+ padding-right: 38px;
}
.fees-table-income {
- float:left;
+ float:right;
+ width:935px;
+ padding-right: 38px;
width: 154px;
- padding: 0 0 0 0;
text-align:right;
color: #444444;
+ margin-top: -21px;
}
.fees-table-date {
float:right;
@@ -55,9 +66,10 @@
background : #EEF2FD;
border-bottom:1px solid #BECFFB;
color : #444;
- height : 1.5em; width : 600px;
+ height : auto;
+ width : 100%;
list-style-type : none;
- padding: 10px 0 0 16px;
+ padding: 10px 0 16px;
font-size: 14px;
}
@@ -66,24 +78,23 @@
background : #DFEAFF;
border-bottom:1px solid #BECFFB;
color : #444;
- height : 1.5em; width : 600px;
+ height : auto;
+ width : 100%;
list-style-type : none;
- padding: 10px 0 0 16px;
+ padding: 10px 0 16px;
font-size: 14px;
}
.fees-table-description a{
- width: 254px;
text-decoration: none;
color: #444444;
}
.fees-table-description a:hover{
- width: 254px;
text-decoration: none;
color: #BB0000;
}
#fees_report_title{
margin-left:200px;
-}
+}
View
39 public/stylesheets/rtl/finance/fees_report.css
@@ -1,5 +1,5 @@
#fees-table{
- padding-top: 10px;
+ padding-top: 10px;
}
.fees-th {
background: none repeat scroll 0 0 #BECFFB;
@@ -7,8 +7,8 @@
font-weight: normal;
height: 1.5em;
list-style-type: none;
- padding: 0.5em 1em 0 0;
- width: 600px;
+ padding: 0.5em 1em 0;
+ width: 100%;
}
.fees-tr {
background-color: #E7EEFF;
@@ -16,7 +16,7 @@
font-size:0.9em;
height: 1.5em;
padding: 0.5em 0 0 0;
- width:600px;
+ width:100%;
}
.fees-table-description {
float:right;
@@ -28,21 +28,32 @@
.fees-table-head-desc {
float:right;
padding: 0 60px 0 0;
- width: 317px;
+ width: 700px;
}
.fees-table-expenses {
- float:right;
+ float:left;
width: 80px;
padding: 0 77px 0 0;
text-align:left;
color: #444444;
+ padding-left: 38px;
+ margin-top: -19px;
+}
+.fees-table-expenses1 {
+ float:left;
+ width: 80px;
+ padding: 0 0 0 77px;
+ text-align:right;
+ color: #444444;
+ padding-right: 38px;
}
.fees-table-income {
- float:right;
- width: 154px;
+ float:left;
+ width: 935px;
padding: 0 0 0 0;
text-align:left;
color: #444444;
+ margin-top: -21px;
}
.fees-table-date {
float:left;
@@ -55,18 +66,20 @@
background : #EEF2FD;
border-bottom:1px solid #BECFFB;
color : #444;
- height : 1.5em; width : 600px;
+ height : auto;
+ width : 100%;
list-style-type : none;
- padding: 10px 16px 0 0;
+ padding: 10px 16px 0;
font-size: 14px;
-
+
}
.listodd{
background : #DFEAFF;
border-bottom:1px solid #BECFFB;
color : #444;
- height : 1.5em; width : 600px;
+ height : auto;
+ width : 100%;
list-style-type : none;
padding: 10px 16px 0 0;
font-size: 14px;
@@ -74,13 +87,11 @@
}
.fees-table-description a{
- width: 254px;
text-decoration: none;
color: #444444;
}
.fees-table-description a:hover{
- width: 254px;
text-decoration: none;
color: #BB0000;
}

0 comments on commit 07834ee

Please sign in to comment.
Something went wrong with that request. Please try again.