Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

nuevo header

  • Loading branch information...
commit 12af407d880dad886503a9996df9ce9dfca3470f 2 parents 6ee159d + 362dc07
@apardo apardo authored
View
BIN  webapp/app/assets/images/botones/mapa.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  webapp/app/assets/images/header.png
Deleted file not rendered
View
BIN  webapp/app/assets/images/home-navigation.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  webapp/app/assets/images/icons/glyphicons_008_film_grey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  webapp/app/assets/images/icons/glyphicons_039_notes_grey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  webapp/app/assets/images/icons/glyphicons_159_picture_grey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  webapp/app/assets/images/icons/glyphicons_184_volume_up_grey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  webapp/app/assets/images/lightbulb-cc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
12 webapp/app/assets/stylesheets/application.css.sass
@@ -24,7 +24,8 @@ p, h1, h2, h3
@extend .alert-info
#wrapper
- padding: 0px 10px 10px 10px
+ padding: 10px
+ margin-top: 15px
background: #e5e5e5 /* Old browsers */
background: -moz-linear-gradient(top, #e5e5e5 0%, #ffffff 5%) /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e5e5e5), color-stop(5%,#ffffff)) /* Chrome,Safari4+ */
@@ -236,6 +237,13 @@ form
.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover
background-color: grey
color: white !important
-
+
+.form-horizontal .control-label
+ margin-right: 16px
+ width: 180px
+
+#header-icons img
+ margin-left: 5px
+
#tagcloud
font-size: 1.8em
View
6 webapp/app/views/pages/index.html.erb
@@ -1,4 +1,6 @@
<% @title = "Inicio" %>
+
+<div id="claim" class="margin" style="font-size:1.2em; margin-left:70px; margin-right:70px;">El <b>'banco de ideas'</b> es una web de almacenamiento y consulta de materiales (textos, fotos, audios y vídeos) relacionados con el <b>movimiento del 15M</b>. Esta herramienta <b>forma parte del proyecto 15m.cc</b>.</div>
<div class="row" style="z-index: 0; position: relative;">
<div class="span12" style="text-align:center;">
<div id="map" style="text-alig:center; margin-left:auto; margin-right:auto;">
@@ -54,8 +56,8 @@
background: url(/assets/botones/mapa.png) no-repeat;
width: 100px;
height: 100px;
- top: 43px;
- left: 40px;
+ top: 38px;
+ left: 35px;
}
#section-timeline {
View
2  webapp/app/views/partials/_content_header.html.erb
@@ -18,7 +18,7 @@
Anónimo
</div>
<% end %>
- <div class="span2">
+ <div class="span2" id="header-icons">
<% case type %>
<% when "text" %>
<%= image_tag "icons/glyphicons_039_notes.png" %>
View
8 webapp/app/views/partials/_form_for_content.html.erb
@@ -72,12 +72,16 @@
No te has registrado, por lo que tendrás que confirmar que eres un humano completando las palabras que ves más abajo en el cuadro. Si no quieres tener que hacer esto cada vez que subas algo tendrás que <%= link_to "registrarte", new_user_registration_path %> o sí ya tienes un usuario <%= link_to "iniciar sesión", new_user_session_path %>.
</div>
- <%= recaptcha_tags %>
+ <div class="control-group">
+ <div class="controls">
+ <%= recaptcha_tags :display => {:theme => "white"}, :ajax => true %>
+ </div>
+ </div>
<br />
<div class="form-field">
- <%= f.check_box :terms, :label => "Acepto las <a href='/pages/condiciones-de-uso' target='_blank'>condiciones de uso</a>", :required => true %>
+ <%= f.check_box :terms, :label => "Acepto las <a href='/pages/condiciones-de-uso' target='_blank'>condiciones de uso</a> [*]", :required => true %>
</div>
<% end %>
View
2  webapp/app/views/users/registrations/edit.html.erb
@@ -25,7 +25,7 @@
<p class="help-block">(necesitamos tu contraseña para confirmar tus cambios)</p>
<% end %>
- <%= f.password_field :password do %>
+ <%= f.password_field :password_new do %>
<p class="help-block">(dejar en blanco si no quieres cambiarla)</p>
<% end %>
View
2  webapp/app/views/users/registrations/new.html.erb
@@ -27,7 +27,7 @@
<%= f.password_field :password_confirmation, :required => true %>
- <%= f.check_box :terms, :label => "Acepto las <a href='/pages/condiciones-de-uso' target='_blank'>condiciones de uso</a>", :required => true %>
+ <%= f.check_box :terms, :label => "Acepto las <a href='/pages/condiciones-de-uso' target='_blank'>condiciones de uso</a> [*]", :required => true %>
<div class="form-actions"><%= f.submit "Registrarse", :class => "btn btn-primary" %></div>
<% end %>
View
34 webapp/config/locales/es.yml
@@ -202,29 +202,31 @@ es:
attributes:
content:
author_myself: ""
- author_name: "Autor (nombre)"
- author_link: "Autor (URL)"
- title: "Título"
- tag_list: "Etiquetas"
- happened_at: "¿Cuándo ha ocurrido?"
- terms: "Acepto las condiciones de uso"
+ author_name: "Autor (nombre) [*]"
+ author_link: "Autor (URL) [*]"
+ title: "Título [*]"
+ tag_list: "Etiquetas [*]"
+ happened_at: "¿Cuándo ha ocurrido? [*]"
address: "Calle"
+ city: "Ciudad [*]"
+ country: "País [*]"
+ text:
+ body: "Texto [*]"
city: "Ciudad"
country: "País"
- text:
- body: "Texto"
video:
- url: "Dirección URL"
+ url: "Dirección URL [*]"
user:
- login: "Usuario o correo electrónico"
- username: "Nombre de usuario"
- email: "Correo electrónico"
+ login: "Usuario o correo electrónico [*]"
+ username: "Nombre de usuario [*]"
+ email: "Correo electrónico [*]"
biography: "Biografía"
- password: "Contraseña"
- current_password: "Contraseña actual"
+ password_new: "Contraseña"
+ password: "Contraseña [*]"
+ current_password: "Contraseña actual [*]"
password_confirmation: "Confirmación de contraseña"
- terms: "Acepto las condiciones de uso"
- name: "Nombre"
+ terms: "Acepto las condiciones de uso [*]"
+ name: "Nombre [*]"
homepage: "URL de tu web"
errors:
models:
Please sign in to comment.
Something went wrong with that request. Please try again.