[vhffs-dev] [svn] commit: r143 - in /trunk: vhffs-packages/ vhffs-panel/ vhffs-panel/group/ vhffs-panel/object/ vhffs-panel/templates/group/ vhffs-panel/templates/menu/ vhffs-panel/templates/user/ vhffs-panel/user/

[vhffs-dev@xxxxxxxxx]

Author: soda
Date: Thu Jan 26 20:48:04 2006
New Revision: 143

Log:
bugfixes on panel and packages build


Added:
    trunk/vhffs-panel/object/
    trunk/vhffs-panel/object/upavatar.pl
      - copied unchanged from r141, trunk/vhffs-panel/user/upavatar.pl
Removed:
    trunk/vhffs-panel/user/upavatar.pl
Modified:
    trunk/vhffs-packages/buildall.sh
    trunk/vhffs-panel/group/prefs.pl
    trunk/vhffs-panel/panel.pl
    trunk/vhffs-panel/templates/group/prefs.tmpl
    trunk/vhffs-panel/templates/menu/main.tmpl
    trunk/vhffs-panel/templates/user/prefs.tmpl
    trunk/vhffs-panel/user/prefs.pl

Modified: trunk/vhffs-packages/buildall.sh
==============================================================================
--- trunk/vhffs-packages/buildall.sh (original)
+++ trunk/vhffs-packages/buildall.sh Thu Jan 26 20:48:04 2006
@@ -36,7 +36,7 @@
 for pkg in `find $DIR -maxdepth 1 -type d`; do
 	if [ -x "$pkg/build" ]; then
 		echo -n "Build package $pkg ..."
-		( cd $pkg && sh build && mv -f output/*.deb output/*.dsc $OUTPUT ) 2>>$LOGFILE 1>>$LOGFILE
+		( cd $pkg && TMPDIR=$TMPDIR sh build && mv -f output/*.deb output/*.dsc $OUTPUT ) 2>>$LOGFILE 1>>$LOGFILE
 		echo "build finish"
 	fi
 

Modified: trunk/vhffs-panel/group/prefs.pl
==============================================================================
--- trunk/vhffs-panel/group/prefs.pl (original)
+++ trunk/vhffs-panel/group/prefs.pl Thu Jan 26 20:48:04 2006
@@ -55,6 +55,7 @@
 	$template->param( VALUE_OWNER => $group->get_owner_username );
 	$template->param( TEXT_DESCRIPTION => gettext("Project Description") );
 	$template->param( VALUE_DESCRIPTION => $group->get_description);
+	$template->param( VALUE_OID => $group->get_oid);
 	$template->param( TEXT_MODIFY => gettext("Modify") );
 	$template->param( TEXT_DELETE_PROJECT => gettext("Delete this project") );
 	$template->param( TEXT_BEFORE_DELETE => gettext("This action is non-reversible. All services associated to this project will be DESTROYED.") );
@@ -66,6 +67,11 @@
 	$template->param( TEXT_USERNAME => gettext("Username") );
 	$template->param( TEXT_JOIN_GROUP => gettext("Add a user in this group") );
 	$template->param( TEXT_SEND => gettext("Add this user !") );
+
+	$template->param( SEND_AVATAR => gettext("Send logo") );
+	$template->param( TEXT_AVATAR => gettext("Send logo") );
+	$template->param( EXPLAIN_AVATAR => gettext("blablabla /*FIXME*/") );
+
 	
 	my $output = "";
 	my $users = Vhffs::Panel::Group::getall_users_per_group( $vhffs , $group->get_groupname );

Modified: trunk/vhffs-panel/panel.pl
==============================================================================
--- trunk/vhffs-panel/panel.pl (original)
+++ trunk/vhffs-panel/panel.pl Thu Jan 26 20:48:04 2006
@@ -27,7 +27,7 @@
 my $message;
 
 my $template;
-my $projectname = $session->param("project");
+my $projectname = $cgi->param("project");
 my $templatedir = $vhffs->get_config->get_templatedir;
 
 #We try to know if an admin want to su
@@ -66,17 +66,16 @@
 	$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
 	$template->param( MESSAGE => $message );
 }
-elsif( ! defined( $projectname ) )
-{
-	$template = right_first Vhffs::Panel::Main($vhffs , $session , $user);
-}
-elsif( $projectname =~ /^none$/ )
-{
-	$template = right_first Vhffs::Panel::Main($vhffs , $session , $user);
-}
 else
 {
-	$template = project_info Vhffs::Panel::Main($vhffs , $session , $user);
+	if( defined $projectname )
+	{
+		$template = project_info Vhffs::Panel::Main($vhffs , $session , $user);
+	}
+	else
+	{
+		$template = right_first Vhffs::Panel::Main($vhffs , $session , $user);
+	}
 }
 
 display Vhffs::Panel::Main($panel, $template->output);

Modified: trunk/vhffs-panel/templates/group/prefs.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/group/prefs.tmpl (original)
+++ trunk/vhffs-panel/templates/group/prefs.tmpl Thu Jan 26 20:48:04 2006
@@ -43,6 +43,17 @@
 	</p>
 </form>
 
+<h2><tmpl_var name="TEXT_AVATAR"></h2>
+	<form method="post" action="../object/upavatar.pl">
+		<p>
+			<tmpl_var name="EXPLAIN_AVATAR">
+		</p>
+		<input type="hidden" name="OID" name="<tmpl_var name="VALUE_OID">"/>
+		<input type="file" name="AVATAR"/>
+			<input type="submit" value="<tmpl_var name="SEND_AVATAR">" />
+	</form>
+
+
 <h2><tmpl_var name="TEXT_DELETE_PROJECT"></h2>
 
 <form method="post" action="delete.pl">

Modified: trunk/vhffs-panel/templates/menu/main.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/menu/main.tmpl (original)
+++ trunk/vhffs-panel/templates/menu/main.tmpl Thu Jan 26 20:48:04 2006
@@ -1,4 +1,4 @@
-<a class="logomenu" href="/panel.pl?project=none">
+<a class="logomenu" href="/panel.pl">
 <img src="/themes/<tmpl_var name="THEME">/images/logo.png"/>
 </a>
 <tmpl_var name="USER_MENU">

Modified: trunk/vhffs-panel/templates/user/prefs.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/user/prefs.tmpl (original)
+++ trunk/vhffs-panel/templates/user/prefs.tmpl Thu Jan 26 20:48:04 2006
@@ -77,10 +77,12 @@
 			</form>
 
 			<h2><tmpl_var name="TEXT_AVATAR"></h2>
-			<form method="post" action="upavatar.pl">
+			<form method="post" action="../object/upavatar.pl">
 				<p>
 				<tmpl_var name="EXPLAIN_AVATAR">
 				</p>
+		        <input type="hidden" name="OID" name="<tmpl_var name="VALUE_OID">"/>
+
 				<input type="file" name="AVATAR"/>
 				<input type="submit" value="<tmpl_var name="SEND_AVATAR">" />
 			</form>

Modified: trunk/vhffs-panel/user/prefs.pl
==============================================================================
--- trunk/vhffs-panel/user/prefs.pl (original)
+++ trunk/vhffs-panel/user/prefs.pl Thu Jan 26 20:48:04 2006
@@ -66,6 +66,8 @@
 $template->param( VALUE_CITY => $user->get_city ); 
 $template->param( VALUE_ADDRESS => $user->get_address ); 
 $template->param( VALUE_COUNTRY => $user->get_country ); 
+
+$template->param( VALUE_OID => $user->get_oid ); 
 
 $template->param( TEXT_DELETE_USER => gettext("Delete YOUR user") );
 $template->param( TEXT_BEFORE_DELETE => gettext("This action is non-reversible. WHEN YOU DELETE IT, YOU CANNOT CANCEL.") );