Merge remote branch 'shadowcat/master' into sc

Conflicts:
	README
	lib/Gitalist.pm
	root/nav/path.tt2

diff --git a/README b/README
index dcdf72f..2de1bfa 100644 (file)
--- a/README
+++ b/README
@@ -73,7 +73,7 @@ INITIAL CONFIGURATION
 
       cp `perl -Ilib -MGitalist -e'print Gitalist->path_to("gitalist.conf")'` gitalist.conf
 
-    You can then edit this confg, adding a repos_dir path and customising
+    You can then edit this confg, adding a repo_dir path and customising
     other settings as desired.
 
     You can then start the Gitalist demo server by setting
@@ -83,15 +83,15 @@ INITIAL CONFIGURATION
 
     Alternatively, if you only want to set a repository directory and are
     otherwise happy with the default configuration, then you can set the
-    "GITALIST_REPO_DIR" environment variable, or pass the "--repos_dir" flag
+    "GITALIST_REPO_DIR" environment variable, or pass the "--repo_dir" flag
     to any of the scripts.
 
         GITALIST_REPO_DIR=/home/myuser/code/git gitalist_server.pl
-        gitalist_server.pl --repos_dir home/myuser/code/git
+        gitalist_server.pl --repo_dir home/myuser/code/git
 
     The "GITALIST_REPO_DIR" environment variable will override the
     repository directory set in configuration, and will itself be overridden
-    by he "--repos_dir" flag.
+    by he "--repo_dir" flag.
 
 RUNNING
     Once you have followed the instructions above to install and configure

diff --git a/lib/Gitalist.pm b/lib/Gitalist.pm
index f213df2..b4b74ba 100644 (file)
--- a/lib/Gitalist.pm
+++ b/lib/Gitalist.pm
@@ -139,7 +139,7 @@ by running:
 
   cp `perl -Ilib -MGitalist -e'print Gitalist->path_to("gitalist.conf")'` gitalist.conf
 
-You can then edit this confg, adding a repos_dir path and customising other settings as desired.
+You can then edit this confg, adding a repo_dir path and customising other settings as desired.
 
 You can then start the Gitalist demo server by setting C<< GITALIST_CONFIG >>. For example:
 
@@ -147,13 +147,13 @@ You can then start the Gitalist demo server by setting C<< GITALIST_CONFIG >>. F
 
 Alternatively, if you only want to set a repository directory and are otherwise happy with
 the default configuration, then you can set the C<< GITALIST_REPO_DIR >> environment
-variable, or pass the C<< --repos_dir >> flag to any of the scripts.
+variable, or pass the C<< --repo_dir >> flag to any of the scripts.
 
     GITALIST_REPO_DIR=/home/myuser/code/git gitalist_server.pl
-    gitalist_server.pl --repos_dir home/myuser/code/git
+    gitalist_server.pl --repo_dir home/myuser/code/git
 
 The C<< GITALIST_REPO_DIR >> environment variable will override the repository directory set
-in configuration, and will itself be overridden by he C<< --repos_dir >> flag.
+in configuration, and will itself be overridden by he C<< --repo_dir >> flag.
 
 =head1 RUNNING
 

diff --git a/root/inc/syntax_highlight_css.tt2 b/root/inc/syntax_highlight_css.tt2
index 5fc9dad..71a132f 100644 (file)
--- a/root/inc/syntax_highlight_css.tt2
+++ b/root/inc/syntax_highlight_css.tt2
@@ -1 +1,2 @@
-[%- IF language %]<link rel="stylesheet" type="text/css" href="[% c.uri_for('/static/css/syntax/' _ language _ '.css') %]"/>[% END -%]
+[%- IF language == 'Diff' %]<link rel="stylesheet" type="text/css" href="[% c.uri_for('/static/css/syntax/Diff.css') %]"/>[% END -%]
+[%- IF language == 'Perl' %]<link rel="stylesheet" type="text/css" href="[% c.uri_for('/static/css/syntax/Perl.css') %]"/>[% END -%]