[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[51765] branches/13.x/lib

[<nk...@us...>]

Revision: 51765
          http://sourceforge.net/p/tikiwiki/code/51765
Author:   nkoth
Date:     2014-06-27 21:34:20 +0000 (Fri, 27 Jun 2014)
Log Message:
-----------
[FIX] Make labels of layouts selectable by users more meaningful and hide layouts that are for internal use only

Modified Paths:
--------------
    branches/13.x/lib/csslib.php
    branches/13.x/lib/prefs/site.php

Modified: branches/13.x/lib/csslib.php
===================================================================
--- branches/13.x/lib/csslib.php	2014-06-27 20:00:49 UTC (rev 51764)
+++ branches/13.x/lib/csslib.php	2014-06-27 21:34:20 UTC (rev 51765)
@@ -25,6 +25,35 @@
 		return $available_layouts;
 	}
 
+	function list_user_selectable_layouts()
+	{
+		$selectable_layouts = array();
+		$available_layouts = $this->list_layouts();
+		foreach ($available_layouts as $layoutName => $layoutLabel) {
+			if ($layoutName == 'mobile'
+				|| $layoutName == 'layout_plain.tpl'
+				|| $layoutName == 'internal'
+			) {
+				// hide layouts that are for internal use only
+				continue;
+			} elseif ($layoutName == 'basic') {
+				$selectable_layouts[$layoutName] = tra('Standard Bootstrap');
+			} elseif ($layoutName == 'classic') {
+				$selectable_layouts[$layoutName] = tra('Classic Tiki with shadows');
+			} elseif ($layoutName == 'header_middle_footer_containers') {
+				$selectable_layouts[$layoutName] = tra('3 separate header, middle, footer containers');
+			} elseif ($layoutName == 'header_middle_footer_containers_3-6-3') {
+				$selectable_layouts[$layoutName] = tra('3 separate header, middle, footer containers with 3-6-3 columns');
+			} elseif ($layoutName == 'social') {
+				$selectable_layouts[$layoutName] = tra('Social networking style');
+			} else {
+				$selectable_layouts[$layoutName] = $layoutLabel;
+			} 
+		}
+
+		return $selectable_layouts;		
+	}
+
 	function list_css($path, $recursive = false)
 	{
 		$files = $this->list_files($path, '.css', $recursive);

Modified: branches/13.x/lib/prefs/site.php
===================================================================
--- branches/13.x/lib/prefs/site.php	2014-06-27 20:00:49 UTC (rev 51764)
+++ branches/13.x/lib/prefs/site.php	2014-06-27 21:34:20 UTC (rev 51765)
@@ -7,7 +7,7 @@
 
 function prefs_site_list()
 {
-    $available_layouts = TikiLib::lib('css')->list_layouts();
+    $available_layouts = TikiLib::lib('css')->list_user_selectable_layouts();
 
 	return array (
 		'site_closed' => array(

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.