openrat-cms

commit 334190ad689b0bcf30599ace1af61cd4639e5612
parent 8a56b43318aaefe78cf24232c4943f68b588c5b6
Author: Jan Dankert <devnull@localhost>
Date:   Sat, 21 Jul 2012 02:42:11 +0200

Anklickbare Tabellenzellen.

Diffstat:
M
action/FolderAction.class.php
 | 
1
+
M
action/GrouplistAction.class.php
 | 
2
+-
M
action/ProjectlistAction.class.php
 | 
1
+
M
action/UserlistAction.class.php
 | 
5
++---
M
themes/default/include/elements.ini.php
 | 
2
+-
M
themes/default/include/html/cell.inc.php
 | 
4
++--
M
themes/default/templates/folder/show.tpl.src.xml
 | 
2
+-
M
themes/default/templates/grouplist/show.tpl.src.xml
 | 
2
+-
M
themes/default/templates/projectlist/show.tpl.src.xml
 | 
2
+-
M
themes/default/templates/userlist/show.tpl.src.xml
 | 
4
++--

10 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/action/FolderAction.class.php b/action/FolderAction.class.php
@@ -998,6 +998,7 @@ class FolderAction extends ObjectAction
 				$list[$id]['desc'] = $list[$id]['desc'].' - '.lang('IMAGE').' '.$id; 
 
 				$list[$id]['type'] = $o->getType();
+				$list[$id]['id'  ] = $id;
 				
 				$list[$id]['icon' ] = $o->getType();
 				$list[$id]['class'] = $o->getType();
diff --git a/action/GrouplistAction.class.php b/action/GrouplistAction.class.php
@@ -47,7 +47,7 @@ class GrouplistAction extends Action
 		foreach( Group::getAll() as $id=>$name )
 		{
 			$list[$id]         = array();
-			$list[$id]['url' ] = Html::url('main','group',$id,array(REQ_PARAM_TARGETSUBACTION=>'edit'));
+			$list[$id]['id'  ] = $id;
 			$list[$id]['name'] = $name;
 		}
 
diff --git a/action/ProjectlistAction.class.php b/action/ProjectlistAction.class.php
@@ -51,6 +51,7 @@ class ProjectlistAction extends Action
 		{
 			$list[$id]             = array();
 			$list[$id]['url'     ] = Html::url('project','edit',$id);
+			$list[$id]['id'      ] = $id;
 			$list[$id]['use_url' ] = Html::url('tree'   ,'load',0  ,array('projectid'=>$id,'target'=>'tree'));
 			$list[$id]['name'    ] = $name;
 		}
diff --git a/action/UserlistAction.class.php b/action/UserlistAction.class.php
@@ -40,9 +40,8 @@ class UserlistAction extends Action
 
 		foreach( User::getAllUsers() as $user )
 		{
-			$list[$user->userid]         = $user->getProperties();
-			$list[$user->userid]['url' ] = Html::url('main','user',$user->userid,
-			                                         array(REQ_PARAM_TARGETSUBACTION=>'edit') );
+			$list[$user->userid]        = $user->getProperties();
+			$list[$user->userid]['id' ] = $user->userid;
 		}
 		$this->setTemplateVar('el',$list);
 	}	
diff --git a/themes/default/include/elements.ini.php b/themes/default/include/elements.ini.php
@@ -5,7 +5,7 @@
 
 output   =
 button   = type:submit,src,class:ok,value:ok,text:button_ok
-cell     = width,style,class,colspan,rowspan,header:false,title,url
+cell     = width,style,class,colspan,rowspan,header:false,title,url,action,id,name
 char     = type:*
 checkbox = default:false,readonly:false,name:*
 date     = date
diff --git a/themes/default/include/html/cell.inc.php b/themes/default/include/html/cell.inc.php
@@ -26,7 +26,7 @@
  title="%title%"
 #END-IF#
 
-#IF-ATTR url#
- onclick="javascript:loadViewByName('<?php echo $view ?>','<?php echo $attr_url ?>'); "
+#IF-ATTR id#
+ onclick="javascript:openNewAction('<?php echo $attr_name ?>','<?php echo $attr_action ?>','<?php echo $attr_id ?>'); "
 #END-IF#
 >
 \ No newline at end of file
diff --git a/themes/default/templates/folder/show.tpl.src.xml b/themes/default/templates/folder/show.tpl.src.xml
@@ -25,7 +25,7 @@
 		</if>
 		<list list="object" extract="true">
 			<row class="data">
-				<cell url="var:url" title="var:desc" class="var:class">
+				<cell  id="var:id" name="var:name" action="var:type" title="var:desc" class="var:class">
 					<image type="var:icon"></image>
 					<text var="name"></text>
 					<text raw="_"></text>
diff --git a/themes/default/templates/grouplist/show.tpl.src.xml b/themes/default/templates/grouplist/show.tpl.src.xml
@@ -8,7 +8,7 @@
 		</row>
 		<list list="el" extract="true">
 			<row class="data">
-				<cell url="var:url">
+				<cell id="var:id" name="var:name" action="group">>
 					<image file="icon_group"></image>
 					<text var="name"></text>
 				</cell>
diff --git a/themes/default/templates/projectlist/show.tpl.src.xml b/themes/default/templates/projectlist/show.tpl.src.xml
@@ -11,7 +11,7 @@
 		</row>
 		<list list="el" extract="true">
 			<row class="data">
-				<cell url="var:url">
+				<cell id="var:id" name="var:name" action="project">
 					<image file="icon_project"></image>
 					<text value="var:name" maxlength="30"></text>
 				</cell>
diff --git a/themes/default/templates/userlist/show.tpl.src.xml b/themes/default/templates/userlist/show.tpl.src.xml
@@ -15,11 +15,11 @@
 		</row>
 		<list list="el" extract="true">
 			<row class="data">
-				<cell url="var:url">
+				<cell id="var:id" name="var:name" action="user">
 					<image type="user"></image>
 					<text var="name"></text>
 				</cell>
-				<cell url="var:url">
+				<cell id="var:id" name="var:name" action="user">
 					<text value="var:fullname"></text>
 					<if true="var:isAdmin">
 						<text raw="_("></text>