Merge branch 'master' of https://github.com/rdutra/slinters

app/assets/javascripts/backbone/templates/page/landing_content.jst.ejs

@@ -1,4 +1,7 @@
 <div class="dashboard_main">
+	<div class="dashboard_single">
+
+	</div>
 	<div class="dashboard-left">
 		DASHBOARD !!!
 	</div>

app/assets/javascripts/backbone/templates/page/landing_top.jst.ejs

@@ -6,9 +6,9 @@
 </div>
 <div class="menu_top">
 		<ul class="top_menu_ul">
+			<li class="menu-item"><a href="#" id="home"> Home </a></li>
 			<li class="menu-item"><a href="#" id="new_transact"> New Transaction</a></li>
-			<li class="menu-item"> Lorem Ipsum</li>
-			<li class="menu-item"> Lorem Ipsum</li>
+			<li class="menu-item"><a href="#" id="transact_list"> Transaction History</a></li>
 			<li class="menu-item"> Lorem Ipsum</li>
 		</ul>
 </div>

app/assets/javascripts/backbone/templates/transaction/transaction_list_big.jst.ejs

@@ -0,0 +1,23 @@
+<div class="transaction_table">
+	<table class="transact_tbl">
+		<thead>
+			<tr>
+				<th>Date</th>
+				<th>Concept</th>
+				<th>Entity</th>
+				<th>Amount</th>
+				<th>Description</th>
+			</tr>
+		</thead>
+		<tbody id="transact_table_bdy">
+			<tr>
+				<td> Hola</td>
+				<td> hola</td>
+			</tr>
+			<tr>
+				<td> Hola</td>
+				<td> hola</td>
+			</tr>
+		</tbody>
+	</table>
+</div>

app/assets/javascripts/backbone/views/page/profile_view.js.coffee

@@ -7,12 +7,17 @@ class Slinters.Views.ProfilePageView extends Backbone.View
 
   # the events hash does not work because it's called before the view has rendered :S  
   events: {
-      "click #new_transact" : "render_transact"
+      "click #new_transact"  : "render_transact",
+      "click #transact_list" : "render_list"
   }
 
   render_transact: ->
     trs = new Slinters.Views.TransactionView
     trs.render()
+
+  render_list: ->
+    trsl = new Slinters.Views.TransactionListView
+    trsl.render()
 
   render_report: ->
 
@@ -22,5 +27,6 @@ class Slinters.Views.ProfilePageView extends Backbone.View
     $('#bottom_bar').html @.template_bottom
     # Binding of events manually
     $('#new_transact').click @.render_transact
+    $('#transact_list').click @.render_list
 
 

app/assets/javascripts/backbone/views/transaction/transaction.js.coffee

@@ -2,6 +2,7 @@ class Slinters.Views.TransactionView extends Backbone.View
   template: JST["backbone/templates/transaction/new_transaction"]
 
   render: ->
+    $('.dashboard_single').html ''
     $('.dashboard-left').html @.template #@model.toJSON()
     $('#transaction_submit').click @.submit_transaction
 
@@ -42,3 +43,10 @@ class Slinters.Views.TransactionView extends Backbone.View
         response = eval(data)
         alert('entered successfully')
 
+class Slinters.Views.TransactionListView extends Backbone.View
+  template: JST["backbone/templates/transaction/transaction_list_big"]
+
+  render: ->
+      $('.dashboard_single').html @.template
+      $('.dashboard-left').html ''
+      $('.dashboard-right').html ''

app/assets/stylesheets/dashboard.css.sass

@@ -17,4 +17,7 @@
 .dashboard-right
   float: right
   width: 50%
+
+.dashboard_single
+  padding: 20px
 

app/assets/stylesheets/transaction.css.sass

@@ -59,3 +59,27 @@
 .transaction_submit:active 
   position: relative
   top: 1px
+
+table.transact_tbl
+  float: left
+  border-width: 2px
+  border-spacing: 1px
+  border-style: none
+  border-color: red
+  border-collapse: collapse
+  background-color: rgb(255, 250, 250)
+
+table.transact_tbl th 
+  border-width: 2px
+  padding: 4px
+  border-style: inset
+  border-color: blue
+  background-color: rgb(250, 240, 230)
+  -moz-border-radius: 6px
+
+table.transact_tbl td 
+  border-width: 2px
+  padding: 4px
+  border-style: inset
+  border-color: blue
+  background-color: rgb(250, 240, 230)