[vhffs-dev] [1940] version and release name back in panel footer templates

[subversion@xxxxxxxxxxxxx]

Revision: 1940
Author:   gradator
Date:     2012-01-25 01:03:18 +0100 (Wed, 25 Jan 2012)
Log Message:
-----------
version and release name back in panel footer templates

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Constants.pm
    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/Constants.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Constants.pm	2012-01-24 23:41:25 UTC (rev 1939)
+++ trunk/vhffs-api/src/Vhffs/Constants.pm	2012-01-25 00:03:18 UTC (rev 1940)
@@ -7,7 +7,7 @@
 use constant
 {
     VHFFS_VERSION => '4.4-dev (Revision: %VHFFS_REVISION%)',
-    VHFFS_RELEASE_NAME => 'To Be Defined',
+    VHFFS_RELEASE_NAME => undef,
     
     WAITING_FOR_VALIDATION => 1,
     VALIDATION_REFUSED => 2,

Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2012-01-24 23:41:25 UTC (rev 1939)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2012-01-25 00:03:18 UTC (rev 1940)
@@ -19,6 +19,7 @@
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Functions;
+use Vhffs::Constants;
 use Vhffs::Panel::User;
 use Vhffs::Panel::Auth;
 
@@ -482,6 +483,8 @@
 	$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-24 23:41:25 UTC (rev 1939)
+++ trunk/vhffs-api/src/Vhffs/Panel/Public.pm	2012-01-25 00:03:18 UTC (rev 1940)
@@ -46,6 +46,7 @@
 use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Tag;
 use Vhffs::Functions;
+use Vhffs::Constants;
 require Vhffs::User;
 require Vhffs::Group;
 require Vhffs::Tag;
@@ -76,7 +77,9 @@
 	$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}) {
 		$vars->{popular_tags} = Vhffs::Tag::get_most_popular_tags($self->{vhffs});

Modified: trunk/vhffs-panel/templates/layouts/anonymous.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/anonymous.tt	2012-01-24 23:41:25 UTC (rev 1939)
+++ trunk/vhffs-panel/templates/layouts/anonymous.tt	2012-01-25 00:03:18 UTC (rev 1940)
@@ -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>') %]</p>
+      <p>[% 'Powered by %s' | i18n | pretty_print('<a href="http://www.vhffs.org";>VHFFS</a>') %] [% vhffs_version %][% IF(vhffs_releasename) %] ([% vhffs_releasename %])[% END %]</p>
     </div>
   </div>
 </div>

Modified: trunk/vhffs-panel/templates/layouts/panel.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/panel.tt	2012-01-24 23:41:25 UTC (rev 1939)
+++ trunk/vhffs-panel/templates/layouts/panel.tt	2012-01-25 00:03:18 UTC (rev 1940)
@@ -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>') %]</p>
+      <p>[% 'Powered by %s' | i18n | pretty_print('<a href="http://www.vhffs.org";>VHFFS</a>') %] [% vhffs_version %][% IF(vhffs_releasename) %] ([% vhffs_releasename %])[% END %]</p>
     </div>
   </div>
 </div>

Modified: trunk/vhffs-public/templates/parts/footer.tt
===================================================================
--- trunk/vhffs-public/templates/parts/footer.tt	2012-01-24 23:41:25 UTC (rev 1939)
+++ trunk/vhffs-public/templates/parts/footer.tt	2012-01-25 00:03:18 UTC (rev 1940)
@@ -1 +1 @@
-<p>[% 'Powered by <a href="http://www.vhffs.org";>VHFFS</a>' | i18n %]</p>
\ No newline at end of file
+<p>[% 'Powered by <a href="http://www.vhffs.org";>VHFFS</a>' | i18n %] [% vhffs_version %][% IF(vhffs_releasename) %] ([% vhffs_releasename %])[% END %]</p>