Skip to content
Browse files

linea temporal y enlaces con js

  • Loading branch information...
1 parent 5a5a574 commit 7479cd9d77a678d33a4f29479bd51fdda748297e @apardo apardo committed
Showing with 26 additions and 3 deletions.
  1. +7 −0 webapp/app/assets/stylesheets/application.css.sass
  2. +19 −3 webapp/app/views/pages/profile.html.erb
View
7 webapp/app/assets/stylesheets/application.css.sass
@@ -193,3 +193,10 @@ form
height: 300px
width: 624px
+
+.hr-profile
+ border: 1px solid #000
+
+#profile-main-links
+ ul li
+ display: inline
View
22 webapp/app/views/pages/profile.html.erb
@@ -50,6 +50,25 @@
</div>
</div>
+<hr class="hr-profile" />
+
+<div class="row">
+ <div class="span3 offset1">
+ <strong>Tus materiales subidos</strong>
+ </div>
+ <div class="span7" id="profile-main-links">
+ <ul>
+ <li><%= link_to 'mapa', '#' %> |</li>
+ <li><strong><%= link_to 'línea temporal', '#' %></strong> |</li>
+ <li><%= link_to 'etiquetas', '#' %></li>
+ </ul>
+ </div>
+</div>
+
+<div class="row">
+ <div class="span12" id="timeline" data-url="/profile/<%= @user.username %>/timeline.json"> </div>
+</div>
+
<div class="span10 mt1">
<div style="margin-top:5em;" class="span12">
@@ -57,9 +76,6 @@
</div>
- <div class="span10">
- <div id="timeline" data-url="/profile/<%= @user.username %>/timeline.json"></div>
- </div>
<div class="span10">

0 comments on commit 7479cd9

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