openrat-cms

commit 20df550b8884d45f13a5cac58c2d2139b4b89a74
parent ec8eecef8fa417657b3bae20eb8c7650c3eb0a4d
Author: Jan Dankert <devnull@localhost>
Date:   Thu, 18 Oct 2012 22:59:44 +0200

Aus der Timeline auch Links zu Objekten ermöglichen.

Diffstat:
model/Project.class.php
 | 
10
+++++++++-
themes/default/include/html/link.inc.php
 | 
4
++--
themes/default/templates/start/projecttimeline.tpl.src.xml
 | 
21
+++++++++++++++++++--
themes/default/templates/start/userprojecttimeline.tpl.src.xml
 | 
21
+++++++++++++++++++--

4 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/model/Project.class.php b/model/Project.class.php
@@ -797,6 +797,10 @@ SQL
 		$sql = new Sql( <<<SQL
 		SELECT {t_object}.id    as objectid,
 		       {t_object}.filename as filename,
+		       {t_object}.is_folder as is_folder,
+		       {t_object}.is_file  as is_file,
+		       {t_object}.is_link  as is_link,
+		       {t_object}.is_page  as is_page,
 		       {t_object}.lastchange_date as lastchange_date,			
 		       {t_name}.name as name				
 		  FROM {t_object}
@@ -868,9 +872,13 @@ SQL
 		$db = db_connection();
 		
 		$sql = new Sql( <<<SQL
-		SELECT {t_object}.id    as objectid,
+		SELECT {t_object}.id       as objectid,
 		       {t_object}.lastchange_date as lastchange_date,
 		       {t_object}.filename as filename,
+		       {t_object}.is_folder as is_folder,
+		       {t_object}.is_file  as is_file,
+		       {t_object}.is_link  as is_link,
+		       {t_object}.is_page  as is_page,
 		       {t_name}.name       as name,
 		       {t_user}.name       as username,
 		       {t_user}.id         as userid,
diff --git a/themes/default/include/html/link.inc.php b/themes/default/include/html/link.inc.php
@@ -50,4 +50,4 @@
 //	if	( substr($tmp_url,0,10) != 'javascript' )
 //		$tmp_url = "javascript:loadViewByName('".$attr_target."','".$tmp_url.(isset($attr_anchor)?'#'.$attr_anchor:'')."'); return false;";
 	
-?><a target="<?php echo $attr_frame ?>"<?php if (isset($attr_name)) { ?> data-name="<?php echo $attr_name ?> name="<?php echo $attr_name ?>"<?php }else{ ?> href="javascript:void(0);" <?php } ?> class="<?php echo $attr_class ?>" data-id="<?php echo $attr_id ?>" data-type="<?php echo $attr_type ?>" data-action="<?php echo $attr_action ?>" data-method="<?php echo $attr_subaction ?>" data-data="<?php echo $tmp_data ?>" <?php if (isset($attr_accesskey)) echo ' accesskey="'.$attr_accesskey.'"' ?>  title="<?php echo encodeHtml($attr_title) ?>">-
\ No newline at end of file
+?><a target="<?php echo $attr_frame ?>"<?php if (isset($attr_name)) { ?> data-name="<?php echo $attr_name ?>" name="<?php echo $attr_name ?>"<?php }else{ ?> href="javascript:void(0);" <?php } ?> class="<?php echo $attr_class ?>" data-id="<?php echo $attr_id ?>" data-type="<?php echo $attr_type ?>" data-action="<?php echo $attr_action ?>" data-method="<?php echo $attr_subaction ?>" data-data="<?php echo $tmp_data ?>" <?php if (isset($attr_accesskey)) echo ' accesskey="'.$attr_accesskey.'"' ?>  title="<?php echo encodeHtml($attr_title) ?>">+
\ No newline at end of file
diff --git a/themes/default/templates/start/projecttimeline.tpl.src.xml b/themes/default/templates/start/projecttimeline.tpl.src.xml
@@ -17,9 +17,26 @@
 			</column>
 		</row>
 		<list list="timeline" extract="true">
+		
+			<!-- Den Typ des Objektes ermitteln -->
+			<if value="var:is_folder" equals="1">
+				<set var="type" value="folder" />
+			</if>
+			<if value="var:is_file" equals="1">
+				<set var="type" value="file" />
+			</if>
+			<if value="var:is_link" equals="1">
+				<set var="type" value="link" />
+			</if>
+			<if value="var:is_page" equals="1">
+				<set var="type" value="page" />
+			</if>
+
 			<row class="data">
-				<column>
-					<text var="name" maxlength="40"></text>
+				<column class="clickable">
+					<link type="open" name="var:name" id="var:objectid" action="var:type">
+						<text var="name" maxlength="40"></text>
+					</link>
 				</column>
 				<column>
 					<text var="filename" maxlength="40"></text>
diff --git a/themes/default/templates/start/userprojecttimeline.tpl.src.xml b/themes/default/templates/start/userprojecttimeline.tpl.src.xml
@@ -14,9 +14,26 @@
 		</row>
 
 		<list list="timeline" extract="true">
+
+			<!-- Den Typ des Objektes ermitteln -->
+			<if value="var:is_folder" equals="1">
+				<set var="type" value="folder" />
+			</if>
+			<if value="var:is_file" equals="1">
+				<set var="type" value="file" />
+			</if>
+			<if value="var:is_link" equals="1">
+				<set var="type" value="link" />
+			</if>
+			<if value="var:is_page" equals="1">
+				<set var="type" value="page" />
+			</if>
+
 			<row class="data">
-				<column>
-					<text var="name" maxlength="40"></text>
+				<column class="clickable">
+					<link type="open" name="var:name" id="var:objectid" action="var:type">
+						<text var="name" maxlength="40"></text>
+					</link>
 				</column>
 				<column>
 					<text var="filename" maxlength="40"></text>