From 59489b86df33eca2dd1f978acc598758f50d4056 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Fri, 24 Sep 2010 19:48:49 -0300
Subject: [PATCH] Removing invented %{} 'markup' from links

---
 app/helpers/application_helper.rb  |  4 ++--
 app/views/blocks/login_block.rhtml |  6 +++---
 app/views/shared/user_menu.rhtml   | 14 +++++++-------
 public/javascripts/application.js  |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b481e91..b166145 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1140,10 +1140,10 @@ module ApplicationHelper
   end
 
   def usermenu_logged_in
-    (_('Welcome, %s') % link_to('<i></i><strong>%{login}</strong>', '/%{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
     usermenu_from_environment_features +
     link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
-    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/%{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
 
diff --git a/app/views/blocks/login_block.rhtml b/app/views/blocks/login_block.rhtml
index 25c639d..c1a3bb9 100644
--- a/app/views/blocks/login_block.rhtml
+++ b/app/views/blocks/login_block.rhtml
@@ -1,8 +1,8 @@
 <div class="logged-user-info" style='display: none;'>
-  <h2><%= _('Logged in as %s') % '%{login}' %></h2>
+  <h2><%= _('Logged in as %s') % '{login}' %></h2>
   <ul>
-    <li><%= _('User since %{year}/%{month}') %></li>
-    <li><%= link_to _('Homepage'), '/%{login}' %></li>
+    <li><%= _('User since {year}/{month}') %></li>
+    <li><%= link_to _('Homepage'), '/{login}' %></li>
   </ul>
   <div class="user-actions">
     <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml
index 051ead7..52dbd32 100644
--- a/app/views/shared/user_menu.rhtml
+++ b/app/views/shared/user_menu.rhtml
@@ -4,23 +4,23 @@
     <div class='logged-in' style='display: none'>
 
     <div id="user_menu_head">
-      <%= image_tag 'icons-app/person-icon.png', :alt => "%{login} icon photo", :height => "20", :border => "0" %>
-      <span><%= _("%s's Menu") % '%{login}' %> </span>
+      <%= image_tag 'icons-app/person-icon.png', :alt => "{login} icon photo", :height => "20", :border => "0" %>
+      <span><%= _("%s's Menu") % '{login}' %> </span>
     </div>
 
     <div id="user_menu_ul">
       <ul>
 
         <li>
-          <%= link_to( '<span class="icon-menu-home"></span>' + __('My Home Page'), '/%{login}')%>
+          <%= link_to( '<span class="icon-menu-home"></span>' + __('My Home Page'), '/{login}')%>
         </li>
 
         <li>
-        <%= link_to('<span class="icon-menu-my-groups"></span>' + _('My groups'), '/myprofile/%{login}/memberships') %>
+        <%= link_to('<span class="icon-menu-my-groups"></span>' + _('My groups'), '/myprofile/{login}/memberships') %>
         </li>
 
         <li>
-        <%= lightbox_link_to('<span class="icon-new"></span>' + _('New article'), '/myprofile/%{login}/cms/new') %>
+        <%= lightbox_link_to('<span class="icon-new"></span>' + _('New article'), '/myprofile/{login}/cms/new') %>
         </li>
 
         <%# for enterprise in user.enterprises %>
@@ -31,12 +31,12 @@
 
         <% if MailConf.enabled? %>
           <li class='webmail-link' style='display: none'>
-          <%= link_to '<span class="icon-menu-mail"></span>' + _('Webmail'), MailConf.webmail_url('%{login}', '%{email_domain}') %>
+          <%= link_to '<span class="icon-menu-mail"></span>' + _('Webmail'), MailConf.webmail_url('{login}', '{email_domain}') %>
           </li>
         <% end %>
 
         <li>
-        <%= link_to('<span class="icon-menu-ctrl-panel"></span>'+ _('Control panel'), '/myprofile/%{login}', :id => 'link_edit_profile') %>
+        <%= link_to('<span class="icon-menu-ctrl-panel"></span>'+ _('Control panel'), '/myprofile/{login}', :id => 'link_edit_profile') %>
         </li>
 
           <li class='admin-link' style='display: none'><%= link_to( '<span class="icon-menu-admin"></span>'+ _('Admin'),
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 86845b0..322b86e 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -455,13 +455,13 @@ jQuery(function($) {
       $('body').addClass('logged-in');
       $('#user .logged-in, .login-block .logged-user-info').each(function() {
         $(this).find('a[href]').each(function() {
-          var new_href = $(this).attr('href').replace('%{login}', data.login);
+          var new_href = $(this).attr('href').replace('{login}', data.login);
           if (data.email_domain) {
-            new_href = new_href.replace('%{email_domain}', data.email_domain);
+            new_href = new_href.replace('{email_domain}', data.email_domain);
           }
           $(this).attr('href', new_href);
         });
-        var html = $(this).html().replace(/%{login}/g, data.login).replace('%{month}', data.since_month).replace('%{year}', data.since_year);
+        var html = $(this).html().replace(/{login}/g, data.login).replace('{month}', data.since_month).replace('{year}', data.since_year);
         $(this).html(html).fadeIn();
         if (data.is_admin) {
           $('#user .admin-link').show();
@@ -578,7 +578,7 @@ function limited_text_area(textid, limit) {
 }
 
 jQuery(function($) {
-  $('a').each(function($) {
+  $('a').each(function() {
     if (this.href == document.location.href) {
       $(this).addClass('link-this-page');
     }
--
libgit2 0.21.2