non-jira : a few fixes, layout/theme related

src/main/java/com/frentix/olat/vitero/_spring/viteroContext.xml

@@ -46,7 +46,7 @@
 		</property>
 	</bean>
 	
-	<!-- Portfolio admin. panel -->
+	<!-- vitero admin. panel -->
 	<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
 		<property name="actionController">	
 			<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
@@ -64,6 +64,6 @@
 				<value>org.olat.admin.SystemAdminMainController</value>		
 			</list>
 		</property>
-		<property name="order" value="39" />
+		
 	</bean>
 </beans>
\ No newline at end of file

src/main/java/org/olat/admin/layout/LayoutAdminController.java

@@ -87,15 +87,7 @@ public class LayoutAdminController extends FormBasicController {
 		if(!themesDir.exists()){
 			logWarn("Themes dir not found: "+staticAbsPath, null);
 		}
-		File[] themes = themesDir.listFiles(new FilenameFilter() {
-			public boolean accept(File dir, String name) {
-				// remove files - only accept dirs
-				if ( ! new File(dir, name).isDirectory()) return false;
-				// remove unwanted meta-dirs
-				if (name.equalsIgnoreCase("CVS")) return false;
-				else if (name.equalsIgnoreCase(".DS_Store")) return false;
-				else return true;
-			}});
+		File[] themes = themesDir.listFiles(new ThemesFileNameFilter());
 		
 		String[] themesStr = new String[themes.length];
 		for (int i = 0; i < themes.length; i++) {
@@ -132,5 +124,24 @@ public class LayoutAdminController extends FormBasicController {
 	protected void formOK(UserRequest ureq) {
 		// saving already done in formInnerEvent method - no submit button
 	}
+	
+	/**
+	 * just a simple fileNameFilter that skips OS X .DS_Store , CVS and .sass-cache directories
+	 * 
+	 * @author strentini
+	 */
+	protected class ThemesFileNameFilter implements FilenameFilter {
+
+		@Override
+		public boolean accept(File dir, String name) {
+				// remove files - only accept dirs
+				if ( ! new File(dir, name).isDirectory()) return false;
+				// remove unwanted meta-dirs
+				if (name.equalsIgnoreCase("CVS")) return false;
+				else if (name.equalsIgnoreCase(".DS_Store")) return false;
+				else if (name.equalsIgnoreCase(".sass-cache")) return false;
+				else return true;
+			}
+	}
 
 }

src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java

@@ -936,6 +936,7 @@ public class FormUIFactory {
 	 */
 	public FormLink addFormLink(String name, String i18nLink, String i18nLabel, FormItemContainer formLayout, int presentation){
 		FormLinkImpl fte = new FormLinkImpl(name,name,i18nLink,presentation);
+		fte.setI18nKey(i18nLink);
 		setLabelIfNotNull(i18nLabel, fte);
 		formLayout.add(fte);
 		return fte;