Merge branch 'make_consul_location_agnostic'

AjuntamentdeBarcelona · Dec 10, 2015 · 7239a4c · 7239a4c
2 parents 5b7fadc + 4cadd7d
commit 7239a4c
Show file tree

Hide file tree

Showing 16 changed files with 89 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,9 @@ cd consul
 bundle install
 cp config/database.yml.example config/database.yml
 cp config/secrets.yml.example config/secrets.yml
+rake db:create
 bin/rake db:setup
+bin/rake db:dev_seed
 RAILS_ENV=test bin/rake db:setup
 ```
 

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
@@ -0,0 +1,5 @@
+module SettingsHelper
+  def setting(key)
+    Setting[key]
+  end
+end
diff --git a/app/views/debates/_featured_debates_static.html.erb b/app/views/debates/_featured_debates_static.html.erb
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
@@ -44,10 +44,6 @@
           <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
         </div>
 
-        <% unless @tag_filter || @search_terms %>
-          <%= render "featured_debates_static" %>
-        <% end %>
-
         <%= render @debates %>
         <%= paginate @debates %>
       </div>

diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
@@ -11,7 +11,7 @@
         <li class="name">
           <%= link_to root_path do %>
             <%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96', alt: t("layouts.header.logo")) %>
-            <%= t("layouts.header.participation_html") %> <span>|</span> <span class="logo-site"><%= t("admin.dashboard.index.title") %></span>
+            <%= setting('brand_name') %> <span>|</span> <span class="logo-site"><%= t("admin.dashboard.index.title") %></span>
           <% end %>
         </li>
         <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -53,21 +53,29 @@
       </div>
 
       <div class="small-12 medium-3 column social">
-        <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
-          <span class="sr-only"><%= t("social.twitter") %></span>
-          <i class="icon-twitter"></i>
+        <% if setting('twitter_handle') %>
+          <%= link_to "https://twitter.com/#{setting 'twitter_handle'}", target: "_blank", title: t("social.twitter") do %>
+            <span class="sr-only"><%= t("social.twitter") %></span>
+            <i class="icon-twitter"></i>
+          <% end %>
         <% end %>
-        <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
-          <span class="sr-only"><%= t("social.facebook") %></span>
-          <i class="icon-facebook"></i>
+        <% if setting('facebook_handle') %>
+          <%= link_to "https://www.facebook.com/#{setting('facebook_handle')}/", target: "_blank", title: t("social.facebook") do %>
+            <span class="sr-only"><%= t("social.facebook") %></span>
+            <i class="icon-facebook"></i>
+          <% end %>
         <% end %>
-        <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
-          <span class="sr-only"><%= t("social.blog") %></span>
-          <i class="icon-blog"></i>
+        <%  if setting('blog_url') %>
+          <%= link_to settings('blog_url'), target: "_blank", title: t("social.blog") do %>
+            <span class="sr-only"><%= t("social.blog") %></span>
+            <i class="icon-blog"></i>
+          <% end %>
         <% end %>
-        <%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
-          <span class="sr-only"><%= t("social.youtube") %></span>
-          <i class="icon-youtube"></i>
+        <% if setting('youtube_handle') %>
+          <%= link_to "https://www.youtube.com/#{setting 'youtube_handle'}", target: "_blank", title: t("social.youtube") do %>
+            <span class="sr-only"><%= t("social.youtube") %></span>
+            <i class="icon-youtube"></i>
+          <% end %>
         <% end %>
       </div>
     </div>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -3,25 +3,33 @@
     <div class="row">
       <%= render "shared/locale_switcher" %>
       <div class="external-links">
-        <%= link_to t("layouts.header.participation_html"), root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
+        <%= link_to setting('brand_name'), root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
         <%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|
         <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>&nbsp;|&nbsp;
           <div class="social inline-block">
-            <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
-              <span class="sr-only"><%= t("social.twitter") %></span>
-              <i class="icon-twitter"></i>
+            <% if setting('twitter_handle') %>
+              <%= link_to "https://twitter.com/#{setting('twitter_handle')}", target: "_blank", title: t("social.twitter") do %>
+                <span class="sr-only"><%= t("social.twitter") %></span>
+                <i class="icon-twitter"></i>
+              <% end %>
             <% end %>
-            <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
-              <span class="sr-only"><%= t("social.facebook") %></span>
-              <i class="icon-facebook"></i>
+            <% if setting('facebook_handle') %>
+              <%= link_to "https://www.facebook.com/#{setting 'facebook_handle'}/", target: "_blank", title: t("social.facebook") do %>
+                <span class="sr-only"><%= t("social.facebook") %></span>
+                <i class="icon-facebook"></i>
+              <% end %>
             <% end %>
-            <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
-              <span class="sr-only"><%= t("social.blog") %></span>
-              <i class="icon-blog"></i>
+            <%  if setting('blog_url') %>
+              <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
+                <span class="sr-only"><%= t("social.blog") %></span>
+                <i class="icon-blog"></i>
+              <% end %>
             <% end %>
-            <%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
-              <span class="sr-only"><%= t("social.youtube") %></span>
-              <i class="icon-youtube"></i>
+            <% if setting('youtube_handle') %>
+              <%= link_to "https://www.youtube.com/#{setting 'youtube_handle'}", target: "_blank", title: t("social.youtube") do %>
+                <span class="sr-only"><%= t("social.youtube") %></span>
+                <i class="icon-youtube"></i>
+              <% end %>
             <% end %>
           </div>
       </div>
@@ -38,7 +46,7 @@
               <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
               <span class="logo-site"><%= t("layouts.header.open_data") %></span>
             <% else %>
-               <%= t("layouts.header.participation_html") %>
+               <%= setting 'brand_name' %>
             <% end %>
           <% end %>
         </li>
@@ -57,9 +65,11 @@
       <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
       <%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if current_page?(controller: "/proposals")) %>
       <%= link_to t("layouts.header.more_information"), "/more_information", class: ("active" if current_page?("/more_information"))  %>
-      <%= link_to t("layouts.header.external_link_blog_url"), target: "_blank" do %>
-        <%= t("layouts.header.external_link_blog") %>
-        <i class="icon-external"></i>
+      <% if setting('blog_url') %>
+        <%= link_to setting('blog_url'), target: "_blank" do %>
+          <%= t("layouts.header.external_link_blog") %>
+          <i class="icon-external"></i>
+        <% end %>
       <% end %>
       </div>
       <div class="small-12 medium-4 column right">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title><%= content_for?(:title) ? yield(:title) : "Gobierno abierto" %></title>
+    <title><%= content_for?(:title) ? yield(:title) : setting('brand_name') %></title>
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
     <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
@@ -14,7 +14,7 @@
           <tr>
             <td style="border-bottom: 1px solid #dadfe1; padding: 20px 0;">
               <a href="#" target="_blank">
-                <%= image_tag('logo_email_gobierno_abierto.png',  style: "border: 0; display: block; width: 100%;max-width: 370px", alt: "Ayuntamiento de Madrid - Participación ciudadana, transparencia y gobierno abierto") %>
+                <%= image_tag('logo_email_gobierno_abierto.png',  style: "border: 0; display: block; width: 100%;max-width: 370px", alt: Setting['brand_name']) %>
               </a>
             </td>
           </tr>
@@ -31,7 +31,7 @@
     <tr>
       <td style="text-align: center; border-top: 1px solid #dadfe1; padding-top: 20px;">
         <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
-        Ayuntamiento de Madrid</p>
+        <%= Setting['brand_name'] %></p>
       </td>
     </tr>
     </tbody>

diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb
@@ -29,7 +29,7 @@
             <li class="name">
               <%= link_to management_root_path do %>
                 <%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96') %>
-                <%= t("layouts.header.participation_html") %> <span>|</span> <span class="logo-site"><%= t("management.dashboard.index.title") %></span>
+                <%= setting 'brand_name' %> <span>|</span> <span class="logo-site"><%= t("management.dashboard.index.title") %></span>
               <% end %>
             </li>
             <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>

diff --git a/app/views/proposals/_featured_votes.html.erb b/app/views/proposals/_featured_votes.html.erb
@@ -35,8 +35,10 @@
   <% end %>
 
   <% if voted_for?(@featured_proposals_votes, proposal) %>
-    <div class="share-supported">
-      <%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: "AbriendoMadrid") %>
-    </div>
+    <% if setting('twitter_handle') %>
+      <div class="share-supported">
+        <%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: setting('twitter_handle')) %>
+      </div>
+    <% end %>
   <% end %>
-</div>
+</div>
diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb
@@ -51,9 +51,9 @@
   </div>
   <% end %>
 
-  <% if voted_for?(@proposal_votes, proposal) %>
+  <% if voted_for?(@proposal_votes, proposal) && setting('twitter_handle') %>
     <div class="share-supported">
-      <%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: "AbriendoMadrid") %>
+      <%= social_share_button_tag(proposal.title, url: proposal_url(proposal), via: setting('twitter_handle')) %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/shared/_social_media_meta_tags.html.erb b/app/views/shared/_social_media_meta_tags.html.erb
@@ -6,11 +6,15 @@
 <meta name="twitter:image" content="<%= image_url '/social-media-icon.png' %>" />
 <!-- Facebook OG -->
 <meta id="ogtitle" property="og:title" content="<%= social_title %>"/>
-<meta property="article:publisher" content="http://decide.madrid.es"/>
-<meta property="article:author" content="https://www.facebook.com/Ayuntamiento-de-Madrid-770904446353931"/>
+<% if setting('url') %>
+  <meta property="article:publisher" content=setting('url')/>
+<% end %>
+<% if setting('facebook_handle') %>
+  <meta property="article:author" content="https://www.facebook.com/#{setting('facebook_handle')}"/>
+<% end %>
 <meta property="og:type" content="article"/>
 <meta id="ogurl" property="og:url" content="<%= social_url %>"/>
 <meta id="ogimage" property="og:image" content="<%= image_url '/social-media-icon.png' %>"/>
-<meta property="og:site_name" content="Madrid Participación"/>
+<meta property="og:site_name" content=setting('brand_name')/>
 <meta id="ogdescription" property="og:description" content="<%= social_description %>"/>
-<meta property="fb:app_id" content="1662598980652932"/>
+<meta property="fb:app_id" content="1662598980652932"/>
diff --git a/config/application.yml b/config/application.yml
@@ -1,4 +1,10 @@
 defaults: &defaults
+  # Brand name of the website.
+  brand_name: "Consul"
+
+  # City or organization.
+  place_name: "Consul"
+
   # Names for the moderation console, as a hint for moderators
   # to know better how to assign users with official positions
   official_level_1_name: "Empleados públicos"
@@ -26,11 +32,18 @@ defaults: &defaults
   # Emails under the domain's subdomains will also be included
   email_domain_for_officials: ''
 
+  twitter_handle: ~
+  facebook_handle: ~
+  youtube_handle: ~
+  blog_url: ~
+
+  url: "http://example.com"
+
 development:
   <<: *defaults
 
 test:
   <<: *defaults
 
 production:
-  <<: *defaults
+  <<: *defaults
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -11,10 +11,8 @@ en:
       external_link_opendata: "Open data"
       external_link_opendata_url: "http://datos.madrid.es"
       external_link_blog: "Blog"
-      external_link_blog_url: "/blog"
       open_gov: "Open government"
       open: "open"
-      participation_html: "Madrid Decide"
       open_data: "Open data"
       open_city_title: "Love the city, and it will become a city you love."
       open_city_slogan_html:
@@ -79,7 +77,6 @@ en:
   debates:
     index:
       title: "Debates"
-      featured_debates_html: "Featured<br>debates"
       start_debate: "Start a debate"
       select_order: "Order by"
       select_order_long: "You are viewing debates according to:"

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -11,10 +11,8 @@ es:
       external_link_opendata: "Datos abiertos"
       external_link_opendata_url: "http://datos.madrid.es"
       external_link_blog: "Blog"
-      external_link_blog_url: "/blog"
       open_gov: "Gobierno %{open}"
       open: "abierto"
-      participation_html: "Barcelona Participa"
       open_data: "Datos abiertos"
       open_city_title: "La ciudad que quieres será la ciudad que quieras."
       open_city_slogan_html:
@@ -79,7 +77,6 @@ es:
   debates:
     index:
       title: "Debates"
-      featured_debates_html: "Debates<br>destacados"
       start_debate: "Empieza un debate"
       select_order: "Ordenar por"
       select_order_long: "Estás viendo los debates"