[Bps-public-commit] r10549 - in SVKUI/trunk: . bin share/web/templates/project share/web/templates/shared

[clsung at bestpractical.com]

Author: clsung
Date: Tue Jan 29 02:44:57 2008
New Revision: 10549

Added:
   SVKUI/trunk/share/web/templates/shared/
Modified:
   SVKUI/trunk/Makefile.PL
   SVKUI/trunk/bin/jifty
   SVKUI/trunk/etc/config.yml
   SVKUI/trunk/share/web/templates/project/index.html

Log:
- reflect new jifty version
- add shared/* for shared UI component around branches 

Modified: SVKUI/trunk/Makefile.PL
==============================================================================
--- SVKUI/trunk/Makefile.PL	(original)
+++ SVKUI/trunk/Makefile.PL	Tue Jan 29 02:44:57 2008
@@ -2,7 +2,7 @@
 
 name        'SVKUI';
 version     '0.01';
-requires    'Jifty' => '0.70422';
+requires    'Jifty' => '0.70824';
 requires 'SVN::Dump';
 requires 'Net::Server::Fork';
 WriteAll;

Modified: SVKUI/trunk/bin/jifty
==============================================================================
--- SVKUI/trunk/bin/jifty	(original)
+++ SVKUI/trunk/bin/jifty	Tue Jan 29 02:44:57 2008
@@ -4,10 +4,10 @@
 use File::Basename qw(dirname); 
 use UNIVERSAL::require;
 
-$ENV{SVKLOGCONFFILE} = 'etc/log.conf';
-unshift @INC, '../../../svk/branches/svk-logger/lib/';
 use Jifty;
 use Jifty::Script;
+$ENV{SVKLOGCONFFILE} = 'etc/log.conf';
+unshift @INC, '../../../svk/trunk/lib/';
 eval {require 'SVK/Root/Checkout.pm'};
 #eval {use SVK::Root::Checkout;};
 

Modified: SVKUI/trunk/etc/config.yml
==============================================================================
--- SVKUI/trunk/etc/config.yml	(original)
+++ SVKUI/trunk/etc/config.yml	Tue Jan 29 02:44:57 2008
@@ -11,6 +11,7 @@
   ApplicationUUID: 5CC062DA-2A3E-11DC-B864-5383DA979DCA
   ConfigFileVersion: 2
   Database: 
+    AutoUpgrade: 1
     CheckSchema: 1
     Database: svkui
     Driver: SQLite
@@ -22,7 +23,8 @@
   DevelMode: 1
   L10N: 
     PoDir: share/po
-  LogLevel: INFO
+#  LogConfig: etc/log4perl.conf
+  LogLevel: DEBUG
   Mailer: Sendmail
   MailerArgs: []
 

Modified: SVKUI/trunk/share/web/templates/project/index.html
==============================================================================
--- SVKUI/trunk/share/web/templates/project/index.html	(original)
+++ SVKUI/trunk/share/web/templates/project/index.html	Tue Jan 29 02:44:57 2008
@@ -9,7 +9,8 @@
 my @outputs = SVKUI->output;
 my $output = join "", @outputs;
 my $edit = Jifty->web->new_action(class =>'CreateBranch');
-my $branches = $project->branches;
+my $merge = Jifty->web->new_action(class =>'MergeBranch', arguments => { project => $project } );
+my @branches = split /\n/, $project->branches;
 my $localbranches = $project->branches('--local');
 </%init>
 <&|/_elements/wrapper,title => $project->name &>
@@ -47,7 +48,19 @@
 <h4>Project trunk path</h4>
 <% '/mirror'.$project->trunkpath %>
 <h4>Project braches</h4>
-<% $branches %>
+<%	Jifty->web->form->start() %>
+<div class="source_branches">
+% for my $branch (@branches) {
+%   my $field = 'from_branch-'.$branch;
+<%      $merge->form_field($field) %>
+% }
+</div>
+<%      $merge->form_field('check_only') %>
+<div class="target_branch">
+<%      $merge->form_field('to_branch') %>
+</div>
+<%      Jifty->web->form->submit( label => 'Merge Branch' ) %>
+<%      Jifty->web->form->end() %>
 <%	Jifty->web->form->start() %>
 <%	$edit->form_field('proj_name', type=> 'hidden', default_value => $project->name ) %>
 <%	$edit->form_field('branch', default_value => '') %>