consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:AyuntamientoMadrid/participacion

Browse Source
This commit is contained in:
rgarcia
2015-07-27 11:39:47 +02:00
parent b674e109a5 fb31863174
commit 427dc1c545
17 changed files with 1765 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/views/debates/_debate.html.erb
View File

@@ -1,12 +1,13 @@
<div id="debate-<%= debate.id %>" class='debate'>
<p><%= link_to debate.title, debate %></p>
<p><%= debate.description %></p>
<div id="debate-<%= debate.id %>" class="small-12 medium-2 large-4 column debate">
<div class="panel">
<i class="fi-comment-quotes left"></i>
<span class="label radius right">Debate</span>
<h3><%= link_to debate.title, debate %></h3>
<p><%= debate.description %></p>
<p> Creado el: <%= l debate.created_at.to_date %> por: <%= debate.author.name %></p>
<p>
Creado el: <%= l debate.created_at.to_date %>
por: <%= debate.author.name %>
</p>
<p><%= render 'shared/tags', debate: debate %></p>
</div>
<br/><br/><br/><br/>
<p><%= render 'shared/tags', debate: debate %></p>
</div>
</div>

17
app/views/debates/index.html.erb
View File

@@ -1,10 +1,11 @@
<h1>Debates sobre Madrid</h1>
<%#= link_to 'New Debate', new_debate_path, :class => 'button radius right' %>
<div id='debates'>
<%= render @debates %>
</div>
<section id='debates' class="debates-index">
<div class="row">
<%= render @debates %>
</div>
</section>
<%= render 'shared/tag_cloud' %>
<br/><br/>
<%= link_to 'New Debate', new_debate_path %>
<aside>
<%= render 'shared/tag_cloud' %>
</aside>

21
app/views/debates/show.html.erb
View File

@@ -1,11 +1,13 @@
<span id="debate-<%= @debate.id %>" style="width:70%; float:left">
<p><%= @debate.title %></p>
<p><%= @debate.description %></p>
<p>
Creado el: <%= l @debate.created_at.to_date %>
por: <%= @debate.author.name %>
</p>
</span>
<article>
<div class="row">
<div id="debate-<%= @debate.id %>" class="small-12 medium-2 large-4 colum">
<h3><%= @debate.title %></h3>
<p><%= @debate.description %></p>
<p>
Creado el: <%= l @debate.created_at.to_date %>
por: <%= @debate.author.name %>
</p>
</div>
<span style="width:30%;float:left">
<div id='in_favor'>
@@ -38,4 +40,5 @@
<% if current_user && @debate.editable_by?(current_user) %>
<%= link_to 'Edit', edit_debate_path(@debate) %> |
<% end %>
<%= link_to 'Back', debates_path %>
<%= link_to 'Back', debates_path %>
</article>

25
app/views/devise/menu/_login_items.html.erb
View File

@@ -1,11 +1,14 @@
<div style="float:right; margin-right:50px">
<% if user_signed_in? %>
<li>
<%= link_to('Logout', destroy_user_session_path, method: :delete) %>
</li>
<% else %>
<li>
<%= link_to('Login', new_user_session_path) %>
</li>
<% end %>
</div>
<ul class="right">
<% if user_signed_in? %>
<li>
<%= link_to('Logout', destroy_user_session_path, method: :delete) %>
</li>
<% else %>
<li>
<%= link_to('Login', new_user_session_path) %>
</li>
<li class="active">
<%#= link_to('Sign up', new_registration_path) %>
</li>
<% end %>
</ul>

1
app/views/layouts/_footer.html.erb Normal file
View File

@@ -0,0 +1 @@
_footer.html.erb

27
app/views/layouts/_header.html.erb
View File

@@ -5,26 +5,27 @@
<div class="right">
<a href="#">Portal de Transparencia</a> | <a href="#">Datos abiertos</a>
</div>
</div>
</div>
</div>
</section>
<div class="contain-to-grid">
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
<h1><a href="#">gobierno<strong>abierto</strong> | Participación</a></h1>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
</ul>
<li class="name">
<h1>
<%= link_to root_path do %>
<%= image_tag('header-logo-madrid.png', :class => 'left', :size => '96x96') %>
gobierno<strong>abierto</strong> | <span>Participación</span>
<% end %>
</h1>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
</ul>
<section class="top-bar-section">
<ul class="right">
<li><a href="#">Entrar</a></li>
<li class="active"><a href="#">Registrarse</a></li>
<%= render 'devise/menu/login_items' %>
</ul>
</section>
<section class="top-bar-section">
<%= render 'devise/menu/login_items' %>
</section>
</nav>
</div>
</header>

42
app/views/layouts/application.html.erb
View File

@@ -1,22 +1,32 @@
<!DOCTYPE html>
<html lang="es">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%= content_for?(:title) ? yield(:title) : "Participación" %></title>
<title><%= content_for?(:title) ? yield(:title) : "Participación" %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
</head>
<body style="margin:50px">
<p class="alert"><%= notice %></p>
<p class="alert"><%= alert %></p>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
</head>
<body>
<%= render 'layouts/header' %>
<% if notice %>
<p class="alert-box success"><%= notice %></p>
<% end %>
<%= render 'devise/menu/login_items' %>
<%= yield %>
</body>
<% if alert %>
<p class="alert-box success"><%= alert %></p>
<% end %>
<div class="row">
<div class="small-12 column">
<%= yield %>
</div>
</div>
</body>
</html>