Commit f1d7d75cb4350f192e3d2c4003ac501e0d79db94
- Diff rendering mode:
- inline
- side by side
| 19 | 19 | </div> | |
| 20 | 20 | ||
| 21 | 21 | <div id="sidebar"> | |
| 22 | <%= link_to "Conferencias", :action => 'lista_conferencias' %><br/></br> | ||
| 23 | <%= link_to "Talleres", :action => 'lista_talleres' %><br/><br/> | ||
| 24 | <%= link_to "Instalaciones", :action => 'lista_instalaciones' %><br/><br/> | ||
| 22 | <div id="menu_link"> <%= link_to "Conferencias", :action => 'lista_conferencias' %></div> | ||
| 23 | <div id="menu_link"> <%= link_to "Talleres", :action => 'lista_talleres' %></div> | ||
| 24 | <div id="menu_link"><%= link_to "Instalaciones", :action => 'lista_instalaciones' %></div> | ||
| 25 | 25 | <!--<%= link_to "Juegos", :action => 'lista_juegos' %> <br/><br/> --> | |
| 26 | <%= link_to "Participantes" , :action => 'lista_participantes' %><br/><br/> | ||
| 27 | <%= link_to "Universidades", :action => 'lista_universidad' %><br/><br/> | ||
| 28 | <%= link_to "Empresas", :action => 'lista_empresas' %><br/><br/> | ||
| 29 | <%= link_to "Usuarios", :action => 'lista_usuarios' %><br/><br/> | ||
| 30 | <%= link_to "Estadisticas", :controller => 'estadisticas', :action => 'index' %><br/><br/> | ||
| 26 | <div id="menu_link"><%= link_to "Participantes" , :action => 'lista_participantes' %></div> | ||
| 27 | <div id="menu_link"><%= link_to "Universidades", :action => 'lista_universidad' %></div> | ||
| 28 | <div id="menu_link"><%= link_to "Empresas", :action => 'lista_empresas' %></div> | ||
| 29 | <div id="menu_link"><%= link_to "Usuarios", :action => 'lista_usuarios' %></div> | ||
| 30 | <div id="menu_link"><%= link_to "Estadisticas", :controller => 'estadisticas', :action => 'index' %></div> | ||
| 31 | 31 | </div> | |
| 32 | 32 | </div><br/> | |
| 33 | 33 | <div id="footer"> |
app/views/layouts/normal.html.erb
(16 / 15)
| 4 | 4 | <title> Sistema de Registro</title> | |
| 5 | 5 | </head> | |
| 6 | 6 | <body> | |
| 7 | <% if session[:user_id] %> | ||
| 8 | <%= link_to "Cerrar Sesion", :controller => 'account', :action => 'logout' %> | | ||
| 9 | <%= link_to "Cambiar Contraseña", :controller => 'account', :action => 'change_password' %> | | ||
| 10 | <%= link_to "Mis Talleres", :controller => 'account', :action => 'mis_talleres' %> | ||
| 11 | <% if User.find_by_id(session[:user_id]).role == 'admin' %> | ||
| 12 | | <%= link_to "Administracion", :controller => 'admin', :action => 'index' %> | ||
| 13 | <%end%> | ||
| 14 | <%else%> | ||
| 15 | <%= link_to "Iniciar Sesion", :controller => 'account', :action => 'login' %> | ||
| 16 | <%end%> | ||
| 7 | |||
| 17 | 8 | <div id="header"> | |
| 18 | 9 | <a href="/"><img src="/images/banner.png" /></a> | |
| 19 | 10 | </div> | |
| … | … | ||
| 14 | 14 | </div> | |
| 15 | 15 | ||
| 16 | 16 | <div id="sidebar"> | |
| 17 | <%= link_to "Conferencias", :action => 'index', :controller => 'conferencias' %><br/></br> | ||
| 18 | <%= link_to "Talleres", :action => 'index', :controller => 'tallers' %><br/><br/> | ||
| 19 | <a href="/juegos">Juegos</a><br/><br/> | ||
| 20 | <a href="/instalaciones">Instalaciones</a><br/><br/> | ||
| 21 | <%= link_to "Estadisticas", :controller => 'estadisticas', :action => 'index' %><br/><br/ | ||
| 17 | <% if session[:user_id] %> | ||
| 18 | <%= link_to "Cerrar Sesion", :controller => 'account', :action => 'logout' %> | | ||
| 19 | <%= link_to "Cambiar Contraseña", :controller => 'account', :action => 'change_password' %> | | ||
| 20 | <%= link_to "Mis Talleres", :controller => 'account', :action => 'mis_talleres' %> | ||
| 21 | <% if User.find_by_id(session[:user_id]).role == 'admin' %> | ||
| 22 | | <%= link_to "Administracion", :controller => 'admin', :action => 'index' %> | ||
| 23 | <%end%> | ||
| 24 | <%else%> | ||
| 25 | <div id="menu_link"><%= link_to "Iniciar Sesion", :controller => 'account', :action => 'login' %></div> | ||
| 26 | <%end%> | ||
| 27 | <div id="menu_link"> <%= link_to "Conferencias", :action => 'index', :controller => 'conferencias' %></div> | ||
| 28 | <div id="menu_link"> <%= link_to "Talleres", :action => 'index', :controller => 'tallers' %></div> | ||
| 29 | <div id="menu_link"> <a href="/juegos">Juegos</a></div> | ||
| 30 | <div id="menu_link"> <a href="/instalaciones">Instalaciones</a></div> | ||
| 31 | <div id="menu_link"> <%= link_to "Estadisticas", :controller => 'estadisticas', :action => 'index' %></div> | ||
| 22 | 32 | </div> | |
| 23 | 33 | </div><br/> | |
| 24 | 34 | <div id="footer"> |
