openrat-cms

commit a149203d2a4364cf80902e89be94e0e0a45d9716
parent 0da1f11102c8b4a6057cbd18c4f72f69984d2554
Author: Jan Dankert <devnull@localhost>
Date:   Sat, 16 Mar 2013 01:53:31 +0100

Panels können jetzt mehrere View mit fester, aber unterschiedlicher Action enthalten.

Diffstat:
themes/default/layout/perspective/administration.ini.php
 | 
10
+---------
themes/default/layout/perspective/login.ini.php
 | 
13
++-----------
themes/default/layout/perspective/normal.ini.php
 | 
8
+-------
themes/default/layout/perspective/profile.ini.php
 | 
13
++++---------
themes/default/layout/perspective/start.ini.php
 | 
12
+++---------
themes/default/layout/perspective/window.php
 | 
10
++++++++--

6 files changed, 19 insertions(+), 47 deletions(-)
diff --git a/themes/default/layout/perspective/administration.ini.php b/themes/default/layout/perspective/administration.ini.php
@@ -2,30 +2,22 @@
 
 [tree]
 
-views=tree
+views=tree:tree
 default=tree
-action=tree
-refreshable=false
 
 
 [content]
 
 views=
-action=
-refreshable=true
 default=edit
 
 
 [side]
 
 views=memberships
-action=project
-refreshable=true
 default=memberships
 
 [bottom]
 
 views=info,pw,rights
-action=project
-refreshable=true
 default=info
diff --git a/themes/default/layout/perspective/login.ini.php b/themes/default/layout/perspective/login.ini.php
@@ -5,24 +5,15 @@ views=
 
 [content]
 
-views=login,openid,register
-action=login
-refreshable=false
+views=login:login,login:openid,login:register
 default=login
 modal=true
 
 [side]
-views=
-action=login
-refreshable=false
+views=login:license
 default=license
 
 
 [bottom]
 views=
 
-;[modal]
-;views=login,openid,register
-;action=login
-;refreshable=false
-;default=login
diff --git a/themes/default/layout/perspective/normal.ini.php b/themes/default/layout/perspective/normal.ini.php
@@ -5,10 +5,8 @@ icons=templatelist,languagelist
 [tree]
 
 title=navigator
-views=tree,settings
+views=tree:tree,tree:settings,start:projectmenu,start:projecttimeline,start:userprojecttimeline
 default=tree
-action=tree
-refreshable=false
 
 
 [content]
@@ -16,20 +14,16 @@ refreshable=false
 views=
 default=
 action=
-refreshable=true
 
 [side]
 
 title=
 default=prop
 views=prop,pub
-action=folder
-refreshable=true
 
 [bottom]
 
 title=
 default=structure
 views=structure,info,preview,progress,console,search,archive,rights
-refreshable=true
 
diff --git a/themes/default/layout/perspective/profile.ini.php b/themes/default/layout/perspective/profile.ini.php
@@ -3,14 +3,11 @@
 
 [tree]
 views=usertimeline
-default     = usertimeline
-action=start
+default     = start:usertimeline
 
 [content]
 
-views       = edit,pw,settings
-action      = profile
-refreshable = false
+views       = profile:edit,profile:pw,profile:settings
 default     = edit
 modal = false
 
@@ -19,7 +16,5 @@ views       =
 default     = 
 
 [bottom]
-views       = memberships
-default     = memberships
-action      = profile
-refreshable = false
+views       = profile:memberships
+default     = profile:memberships
diff --git a/themes/default/layout/perspective/start.ini.php b/themes/default/layout/perspective/start.ini.php
@@ -1,22 +1,16 @@
 <?php  ?>
 
 [tree]
-views=projectmenu
+views=start:projectmenu
 default=projectmenu
-action=start
-refreshable=false
 
 [content]
 
-views=timeline,usertimeline
+views=start:timeline,start:usertimeline
 default=timeline
-action=start
-refreshable=false
 
 [side]
-views=applications
-action=start
-refreshable=false
+views=start:applications
 default=applications
 
 [bottom]
diff --git a/themes/default/layout/perspective/window.php b/themes/default/layout/perspective/window.php
@@ -22,11 +22,17 @@ function view_header( $name )
 	// Tabreiter pro View erzeugen
     foreach( $viewlist as $vn )
           {
+          	$actionAndMethod = explode(':',$vn);
+          	if	( count($actionAndMethod) > 1 )
+          		list($action,$vn) = $actionAndMethod;
+          	else $action = '';
+          	 
+          		
           	$tmp_text = langHtml('menu_'.$vn);
-			$liClass  = 'action'.($vn==$v['default']?' active':'').(@$v['refreshable']?' dependent':' static');
+			$liClass  = 'action'.($vn==$v['default']?' active':'').(empty($action)?' dependent':' static');
 			$icon_url = OR_THEMES_EXT_DIR.'default/images/icon/'.$vn.'.png';
 			
-			?><li data-action="<?php echo @$v['action'] ?>" data-id="0" data-method="<?php echo $vn ?>" class="<?php echo $liClass?>" title="<?php echo langHtml('menu_'.$vn.'_desc'); ?>"><?php
+			?><li data-action="<?php echo $action ?>" data-id="0" data-method="<?php echo $vn ?>" class="<?php echo $liClass?>" title="<?php echo langHtml('menu_'.$vn.'_desc'); ?>"><?php
           		?><img class="icon" src="<?php echo $icon_url ?>" /><div class="tabname"><?php echo $tmp_text ?></div><?php
           	?></li><?php
           }