summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2010-01-18 09:26:56 +0100
committerJohan Sørensen <johan@johansorensen.com>2010-01-18 09:26:56 +0100
commitdfff7be0d611211339ff147a0fd38fd5d2433535 (patch)
treeece238cf4244232871a278b96400a4dc08062d79
parentb0d1df4f566323a4591d0f1d0cd2f892df9608e1 (diff)
downloadgitorious-mainline-outdated-dfff7be0d611211339ff147a0fd38fd5d2433535.zip
gitorious-mainline-outdated-dfff7be0d611211339ff147a0fd38fd5d2433535.tar.gz
gitorious-mainline-outdated-dfff7be0d611211339ff147a0fd38fd5d2433535.tar.bz2
Make sure we use gitorious_host from the config for the dashboard url
-rw-r--r--app/helpers/application_helper.rb4
-rw-r--r--app/helpers/breadcrumbs_helper.rb2
-rw-r--r--app/views/layouts/_login_logout.html.erb2
3 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a7e4559..8475c44 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -522,4 +522,8 @@ module ApplicationHelper
content_tag(:div, link_to(label, url, :class => "round-10"),
:id => options.delete(:id), :class => css_classes.flatten.join(" "))
end
+
+ def dashboard_path
+ root_url(:host => GitoriousConfig["gitorious_host"])
+ end
end
diff --git a/app/helpers/breadcrumbs_helper.rb b/app/helpers/breadcrumbs_helper.rb
index e1a1fa9..f068b9b 100644
--- a/app/helpers/breadcrumbs_helper.rb
+++ b/app/helpers/breadcrumbs_helper.rb
@@ -91,7 +91,7 @@ module BreadcrumbsHelper
when Message
an_object.new_record? ? new_message_path : message_path(an_object)
when Breadcrumb::Dashboard
- root_path
+ dashboard_path
else
"" # Current path
end
diff --git a/app/views/layouts/_login_logout.html.erb b/app/views/layouts/_login_logout.html.erb
index 1c5f181..592ebe1 100644
--- a/app/views/layouts/_login_logout.html.erb
+++ b/app/views/layouts/_login_logout.html.erb
@@ -21,7 +21,7 @@
<li><%= link_to t("views.layout.admin"), admin_users_path -%></li>
<% end -%>
- <li class="secondary"><%= link_to "Your dashboard", root_path -%></li>
+ <li class="secondary"><%= link_to "Your dashboard", dashboard_path -%></li>
<li class="secondary">
<%= link_to h(current_user.to_param_with_prefix), user_path(current_user) -%>
</li>