[vhffs-dev] [1941] improved vhffs release name display (note for Sebastien: this commit does not exist)

[subversion@xxxxxxxxxxxxx]

Revision: 1941
Author:   gradator
Date:     2012-01-25 10:34:09 +0100 (Wed, 25 Jan 2012)
Log Message:
-----------
improved vhffs release name display (note for Sebastien: this commit does not exist)

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/Main.pm
    trunk/vhffs-api/src/Vhffs/Panel/Public.pm
    trunk/vhffs-panel/templates/layouts/anonymous.tt
    trunk/vhffs-panel/templates/layouts/panel.tt
    trunk/vhffs-public/templates/parts/footer.tt

Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2012-01-25 00:03:18 UTC (rev 1940)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2012-01-25 09:34:09 UTC (rev 1941)
@@ -396,8 +396,12 @@
 	my $create_vars = {
 		INCLUDE_PATH => $self->{templatedir}.(defined $include_path ? '/'.$include_path.'/' : '/panel/'),
 		CONSTANTS => {
+			vhffs => {
+				VERSION                     => Vhffs::Constants::VHFFS_VERSION,
+				RELEASE_NAME                => Vhffs::Constants::VHFFS_RELEASE_NAME,
+			},
 			object_statuses => {
-				WAITING_FOR_VALIDATION      =>Vhffs::Constants::WAITING_FOR_VALIDATION,
+				WAITING_FOR_VALIDATION      => Vhffs::Constants::WAITING_FOR_VALIDATION,
 				VALIDATION_REFUSED          => Vhffs::Constants::VALIDATION_REFUSED,
 				WAITING_FOR_CREATION        => Vhffs::Constants::WAITING_FOR_CREATION,
 				CREATING_ERROR              => Vhffs::Constants::CREATING_ERROR,
@@ -483,8 +487,6 @@
 	$vars->{infos} = $self->{infos};
 	$vars->{current_user} = $self->{user};
 	$vars->{current_group} = $self->{group};
-	$vars->{vhffs_version} = Vhffs::Constants::VHFFS_VERSION;
-	$vars->{vhffs_releasename} = Vhffs::Constants::VHFFS_RELEASE_NAME;
 
 	# Handling ajax stuff
 	if($self->{is_ajax_request}) {

Modified: trunk/vhffs-api/src/Vhffs/Panel/Public.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Public.pm	2012-01-25 00:03:18 UTC (rev 1940)
+++ trunk/vhffs-api/src/Vhffs/Panel/Public.pm	2012-01-25 09:34:09 UTC (rev 1941)
@@ -77,8 +77,6 @@
 	$vars->{help_url} = $conf->get_panel->{url_help};
 	$vars->{users_avatar} = Vhffs::Functions::strtobool( $conf->get_panel->{'users_avatars'} );
 	$vars->{groups_avatar} = Vhffs::Functions::strtobool( $conf->get_panel->{'groups_avatars'} );
-	$vars->{vhffs_version} = Vhffs::Constants::VHFFS_VERSION;
-	$vars->{vhffs_releasename} = Vhffs::Constants::VHFFS_RELEASE_NAME;
 
 	# Handling ajax stuff
 	unless($self->{is_ajax_request}) {

Modified: trunk/vhffs-panel/templates/layouts/anonymous.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/anonymous.tt	2012-01-25 00:03:18 UTC (rev 1940)
+++ trunk/vhffs-panel/templates/layouts/anonymous.tt	2012-01-25 09:34:09 UTC (rev 1941)
@@ -34,7 +34,7 @@
 [% PROCESS $template %]
     </div>
     <div id="footer">
-      <p>[% 'Powered by %s' | i18n | pretty_print('<a href="http://www.vhffs.org";>VHFFS</a>') %] [% vhffs_version %][% IF(vhffs_releasename) %] ([% vhffs_releasename %])[% END %]</p>
+      <p>[% 'Powered by %s' | i18n | pretty_print('<a href="http://www.vhffs.org";>VHFFS</a>') %] [% constants.vhffs.version %][% IF(constants.vhffs.release_name) %] ([% constants.vhffs.release_name %])[% END %]</p>
     </div>
   </div>
 </div>

Modified: trunk/vhffs-panel/templates/layouts/panel.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/panel.tt	2012-01-25 00:03:18 UTC (rev 1940)
+++ trunk/vhffs-panel/templates/layouts/panel.tt	2012-01-25 09:34:09 UTC (rev 1941)
@@ -23,7 +23,7 @@
 [% PROCESS $template %]
     </div>
     <div id="footer">
-      <p>[% 'Powered by %s' | i18n | pretty_print('<a href="http://www.vhffs.org";>VHFFS</a>') %] [% vhffs_version %][% IF(vhffs_releasename) %] ([% vhffs_releasename %])[% END %]</p>
+      <p>[% 'Powered by %s' | i18n | pretty_print('<a href="http://www.vhffs.org";>VHFFS</a>') %] [% constants.vhffs.version %][% IF(constants.vhffs.release_name) %] ([% constants.vhffs.release_name %])[% END %]</p>
     </div>
   </div>
 </div>

Modified: trunk/vhffs-public/templates/parts/footer.tt
===================================================================
--- trunk/vhffs-public/templates/parts/footer.tt	2012-01-25 00:03:18 UTC (rev 1940)
+++ trunk/vhffs-public/templates/parts/footer.tt	2012-01-25 09:34:09 UTC (rev 1941)
@@ -1 +1 @@
-<p>[% 'Powered by <a href="http://www.vhffs.org";>VHFFS</a>' | i18n %] [% vhffs_version %][% IF(vhffs_releasename) %] ([% vhffs_releasename %])[% END %]</p>
+<p>[% 'Powered by <a href="http://www.vhffs.org";>VHFFS</a>' | i18n %] [% constants.vhffs.version %][% IF(constants.vhffs.release_name) %] ([% constants.vhffs.release_name %])[% END %]</p>