[vhffs-dev] [2109] Fixed release name display on panel

[subversion@xxxxxxxxxxxxx]

Revision: 2109
Author:   gradator
Date:     2012-03-03 17:55:51 +0100 (Sat, 03 Mar 2012)
Log Message:
-----------
Fixed release name display on panel

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

Added Paths:
-----------
    trunk/vhffs-panel/templates/layouts/footer.tt

Modified: trunk/vhffs-api/src/Vhffs/Panel/Auth.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Auth.pm	2012-03-03 16:37:48 UTC (rev 2108)
+++ trunk/vhffs-api/src/Vhffs/Panel/Auth.pm	2012-03-03 16:55:51 UTC (rev 2109)
@@ -59,10 +59,6 @@
 			groups => $stats->get_groups_activated
 		};
 	}
-	$vars->{version_info} = {
-		version => Vhffs::Constants::VHFFS_VERSION,
-		name => Vhffs::Constants::VHFFS_RELEASE_NAME
-	};
 
 	$panel->render( 'anonymous/login.tt', $vars, 'anonymous.tt' );
 }

Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am	2012-03-03 16:37:48 UTC (rev 2108)
+++ trunk/vhffs-panel/templates/Makefile.am	2012-03-03 16:55:51 UTC (rev 2109)
@@ -43,6 +43,7 @@
 	group/tags.tt \
 	layouts/anonymous.tt \
 	layouts/panel.tt \
+	layouts/footer.tt \
 	mail/create.tt \
 	mail/prefs.tt \
 	mailinglist/create.tt \

Modified: trunk/vhffs-panel/templates/layouts/anonymous.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/anonymous.tt	2012-03-03 16:37:48 UTC (rev 2108)
+++ trunk/vhffs-panel/templates/layouts/anonymous.tt	2012-03-03 16:55:51 UTC (rev 2109)
@@ -35,7 +35,7 @@
 [% PROCESS $template %]
     </div>
     <div id="footer">
-      <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>
+      [% INCLUDE layouts/footer.tt %]
     </div>
   </div>
 </div>

Added: trunk/vhffs-panel/templates/layouts/footer.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/footer.tt	                        (rev 0)
+++ trunk/vhffs-panel/templates/layouts/footer.tt	2012-03-03 16:55:51 UTC (rev 2109)
@@ -0,0 +1 @@
+<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>

Modified: trunk/vhffs-panel/templates/layouts/panel.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/panel.tt	2012-03-03 16:37:48 UTC (rev 2108)
+++ trunk/vhffs-panel/templates/layouts/panel.tt	2012-03-03 16:55:51 UTC (rev 2109)
@@ -25,7 +25,7 @@
 [% PROCESS $template %]
     </div>
     <div id="footer">
-      <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>
+      [% INCLUDE layouts/footer.tt %]
     </div>
   </div>
 </div>

Modified: trunk/vhffs-public/templates/parts/footer.tt
===================================================================
--- trunk/vhffs-public/templates/parts/footer.tt	2012-03-03 16:37:48 UTC (rev 2108)
+++ trunk/vhffs-public/templates/parts/footer.tt	2012-03-03 16:55:51 UTC (rev 2109)
@@ -1 +1 @@
-<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>
+<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>