Rolling back 2 files that were unintentionally committed with r7350

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java

@@ -50,7 +50,7 @@ public class BrowseController extends FreemarkerHttpServlet {
      
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
-        return "Index of Contents";
+    	return "Index to " + siteName + " Contents";
     }
 
     @Override
@@ -72,12 +72,17 @@ public class BrowseController extends FreemarkerHttpServlet {
     	    message = "The system is not configured correctly. Please check your logs for error messages.";
     	}else{    	
     	    groups =vcgc.getGroups( vreq.getPortalId());
+    	    if (groups == null || groups.isEmpty()) {
+                message = "There are not yet any items in the system.";
+            }
+            else {          
                 List<VClassGroupTemplateModel> vcgroups = new ArrayList<VClassGroupTemplateModel>(groups.size());           
                 for (VClassGroup group : groups) {
                     vcgroups.add(new VClassGroupTemplateModel(group));
                 }
                 body.put("classGroups", vcgroups);
             } 
+    	}	            	            
     	
     	if (message != null) {
     	    body.put("message", message);

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerConfigurationLoader.java

@@ -126,10 +126,6 @@ public class FreemarkerConfigurationLoader {
             log.error("Error setting value for url_escaping_charset.");
         }
         
-        // auto include setup.ftl which allows for globals to be easily defined in a template that's always included
-        // used primarily to setup ${bodyClasses} for now
-        config.addAutoInclude("pageSetup.ftl");
-        
         config.setTemplateLoader(getTemplateLoader(config, themeDir));        
         
         return config;