Permalink
Browse files

Merge branch 'master' of git@github.com:marcusramberg/mojomojo

Conflicts:
	Changes
  • Loading branch information...
marcusramberg committed Jan 30, 2009
2 parents ba25c65 + 28bc547 commit b530d92fdf7211ad32c34cfcb0e3698bd87a79da
Showing with 10 additions and 7 deletions.
  1. +2 −0 Changes
  2. +1 −0 Makefile.PL
  3. +4 −4 root/base/pager.tt
  4. +3 −3 script/mojomojo_spawn_db.pl
View
@@ -1,4 +1,6 @@
+<<<<<<< HEAD:Changes
0.999027 2009-01-30 23:17:00
+ - Fixed broken authors (users) pager links.
- Added "Split Edit" for side-by-side view/edit.
- Switched from Cache::Store::Memory to Cache::FastMmap
- Change search results by link to link to ROOT/$author instead of author at page level.
View
@@ -62,6 +62,7 @@ requires(
'DBIx::Class' => '0.08',
'Syntax::Highlight::Engine::Kate' => 0,
'Cache::FastMmap' => 0,
+ 'Config::JFDI' => 0,
);
feature 'Automatic deployment', 'SQL::Translator';
View
@@ -1,15 +1,15 @@
<div class="pager">
[% UNLESS pager.current_page == pager.first_page %]
<ul class="prev">
- <li><a href="[% c.req.uri_with( { page => pager.first_page } ) %]">&lt;&lt;</a></li>
- <li><a href="[% c.req.uri_with( { page => pager.previous_page } ) %]">&lt;</a></li>
+ <li><a href="[% c.uri_for(c.req.path) _ '?page=' _ pager.first_page %]">&lt;&lt;</a></li>
+ <li><a href="[% c.uri_for(c.req.path) _ '?page=' _ pager.previous_page %]">&lt;</a></li>
</ul>
[% END %]
[% UNLESS pager.current_page == pager.last_page %]
<ul class="next">
- <li><a href="[% c.req.uri_with( { page => pager.next_page } ) %]">&gt;</a></li>
- <li><a href="[% c.req.uri_with( { page => pager.last_page } ) %]">&gt;&gt;</a></li>
+ <li><a href="[% c.uri_for(c.req.path) _ '?page=' _ pager.next_page %]">&gt;</a></li>
+ <li><a href="[% c.uri_for(c.req.path) _ '?page=' _ pager.last_page %]">&gt;&gt;</a></li>
</ul>
[% END %]
@@ -7,13 +7,13 @@
use FindBin '$Bin';
use lib "$Bin/../lib";
use MojoMojo::Schema;
-use Config::General;
+use Config::JFDI;
-my $cfg = Config::General->new("$Bin/../mojomojo.conf");
-my $config = { $cfg->getall };
+my $jfdi = Config::JFDI->new(name => "MojoMojo");
+my $config = $jfdi->get;
my ($dsn, $user, $pass) = @ARGV;
eval {

0 comments on commit b530d92

Please sign in to comment.