Small Code Refactor in Portal

I did a bit of a refactor and removed some duplicate code that was getting ugly to maintain in
SkinnableCharonPortal.java
WorksiteHandler.java
It was the code that sets up the order of the top tabs. Some folks like Charles Sturt are interested in customizing this code and it is really sad to maintain it two places particularly when customizing it across a few releases.
It is a simple refactor – stuff that was natively in the context is now in a map called siteTabs like in this diff:
-#if ( $pageNavToolsCount > 1 || ! $pageMaxIfSingle )
+#if ( $sitePages.pageNavToolsCount > 1 || ! $sitePages.pageMaxIfSingle )
If this goes awry – you will see the string “$siteTabs” in your output. I have tested every place I could think of – but it is always possible to have made a mistake.


charles-severances-computer:~/dev/sakai/portal csev$ svn commit
Sending portal-api/api/src/java/org/sakaiproject/portal/api/Portal.java
Sending portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
Sending portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/WorksiteHandler.java
Sending portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm
Transmitting file data ….
Committed revision 29819.