[SUCS Devel] site r675 - in branches/beta: . static templates

[imranh at sucs.org]

Author: imranh
Date: 2015-04-14 20:33:54 +0100 (Tue, 14 Apr 2015)
New Revision: 675

Modified:
   branches/beta/
   branches/beta/static/
   branches/beta/templates/branding.tpl
Log:
Merge changes from trunk into beta


Property changes on: branches/beta
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/imranh:590-591
/branches/sucs-site:318-656
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665,667-670,672
   + /branches/imranh:590-591
/branches/sucs-site:318-656
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665,667-670,672,674


Property changes on: branches/beta/static
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/imranh/static:590-591
/branches/sucs-site/branches/sucs-site/static:590-591
/trunk/static:664-665,667-670,672
   + /branches/imranh/static:590-591
/branches/sucs-site/branches/sucs-site/static:590-591
/trunk/static:664-665,667-670,672,674

Modified: branches/beta/templates/branding.tpl
===================================================================
--- branches/beta/templates/branding.tpl	2015-04-14 19:31:30 UTC (rev 674)
+++ branches/beta/templates/branding.tpl	2015-04-14 19:33:54 UTC (rev 675)
@@ -3,7 +3,7 @@
 	<div class="cornerTopLeft">
 	<div class="cornerTopRight">
 		<div id="logo">
-			<a href="{$baseurl}"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76" alt="SUCS" /></a>
+			<a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76" alt="SUCS" /></a>
 		</div>
 
 {include file="login.tpl"}