aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/layouts/admin.rhtml3
l---------config/locales2
-rwxr-xr-xscript/runner10
3 files changed, 9 insertions, 6 deletions
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index a209715e1..5fe75fc97 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -8,12 +8,11 @@
<body>
<p>
- <strong><%= link_to 'WhatDoTheyKnow', main_url('/') %> admin:</strong>
+ <strong><%= link_to 'Alaveteli', main_url('/') %> admin:</strong>
<%= link_to 'Summary', admin_general_index_path %>
| <%= link_to 'Timeline', admin_timeline_path %>
| <%= link_to 'Stats', admin_stats_path %>
| <%= link_to 'Debug', admin_debug_path %>
- | <%= link_to 'Wiki', "https://secure.mysociety.org/intranet/ProductionSites/WhatDoTheyKnow/WebHome" %>
<strong>View:</strong>
<%= link_to 'Authorities', admin_body_list_path %>
| <%= link_to 'Requests', admin_request_list_path %>
diff --git a/config/locales b/config/locales
index 748fbfcbe..10a4f96c3 120000
--- a/config/locales
+++ b/config/locales
@@ -1 +1 @@
-/home/seb/Code/alaveteli/vendor/rails-locales/rails/locale \ No newline at end of file
+../vendor/rails-locales/rails/locale \ No newline at end of file
diff --git a/script/runner b/script/runner
index e5f52ff8e..e6b09cfe5 100755
--- a/script/runner
+++ b/script/runner
@@ -1,5 +1,9 @@
#!/usr/bin/ruby
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/runner' \ No newline at end of file
+script_dir = File.dirname(__FILE__)
+alaveteli_dir = File.join(script_dir, "..")
+
+Dir.chdir(alaveteli_dir) do
+ require File.dirname(__FILE__) + '/../config/boot'
+ require 'commands/runner'
+end