Download as
Browse Code »

Commit 33a9f4afc15f19603187c0d5fd817073ec02c67d

Authored by Joenio Costa
1 parent 1f8a1560
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Adding more flexbility to themes

Showing 3 changed files with 2 additions and 5 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @33a9f4a
... ... @@ -1177,7 +1177,7 @@ module ApplicationHelper
1177 1177 pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1178 1178 end
1179 1179  
1180   - (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
  1180 + (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
1181 1181 render_environment_features(:usermenu) +
1182 1182 link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
1183 1183 manage_enterprises.to_s +
... ...
app/views/layouts/application-ng.rhtml
  Diff comments   View file @33a9f4a
... ... @@ -53,7 +53,7 @@
53 53 <%= usermenu_logged_in %>
54 54 </span>
55 55 <span class='not-logged-in' style='display: none'>
56   - <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login'), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
  56 + <%= _("<span class='login'>%s</span> <span class='or'>or</span> <span class='signup'>%s</span>") % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login'), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
57 57 <div id='inlineLoginBox' style='display: none;'>
58 58 <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
59 59 </div>
... ...
public/designs/themes/base/style.css
  Diff comments   View file @33a9f4a
... ... @@ -1243,9 +1243,6 @@ table.profile th {
1243 1243  
1244 1244 .browse-results-innerbox {
1245 1245 margin-top: 10px;
1246   - border-bottom: none;
1247   - border: 1px solid #CCC;
1248   - background: url(imgs/comment-bg-S.png) 0% 100% repeat-x;
1249 1246 padding-bottom: 10px;
1250 1247  
1251 1248 }
... ...