[evolvis-commits] r7084: Tracker Power Query: fix XHTML and make use of Forge theming↵

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Nov 17 16:32:46 CET 2010


Author: mirabilos
Date: 2010-11-17 16:32:46 +0100 (Wed, 17 Nov 2010)
New Revision: 7084

Modified:
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/www/tracker/query.php
Log:
Tracker Power Query: fix XHTML and make use of Forge theming


Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-11-17 15:32:44 UTC (rev 7083)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-11-17 15:32:46 UTC (rev 7084)
@@ -24,7 +24,8 @@
   * PM Select Columns now use Forge theming.
   * New Layout/Theme method js_once('foo.js') to load www/js/foo.js
     only once, at headerCSS() call; switch Evolvis theme to use it.
-  * gf-web: pull libjs-prototype
+  * gf-web: pull libjs-prototype and add Control.DatePicker.
+  * Tracker Power Query: fix XHTML and make use of Forge theming.
 
   [ Patrick Apel ]
   * When sending out Tasks mails, issue permalinks [#1047].
@@ -32,7 +33,7 @@
   * Bugfix [#1018] Status in Tasks falsch.
   * [#1019] Cumulate Tasks estimated hours, display in overview.
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 17 Nov 2010 16:05:52 +0100
+ -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 17 Nov 2010 16:31:20 +0100
 
 gforge (4.8.3+evolvis26.2) unstable; urgency=high
 

Modified: trunk/gforge_base/evolvisforge/gforge/www/tracker/query.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/tracker/query.php	2010-11-17 15:32:44 UTC (rev 7083)
+++ trunk/gforge_base/evolvisforge/gforge/www/tracker/query.php	2010-11-17 15:32:46 UTC (rev 7084)
@@ -214,28 +214,14 @@
 
 //	Show the new pop-up boxes to select assigned to, status, etc
 //
-?><html>
-<head>
-<title>Query</title>
-<link rel="stylesheet" type="text/css" href="<?php echo util_make_url ('/themes/css/gforge-compat.css'); ?>" />
-<?php
-print forgeplucker_meta();
 
-$theme_cssfile=$GLOBALS['sys_themeroot'].$GLOBALS['sys_theme'].'/css/theme.css';
-if (file_exists($theme_cssfile)){
-echo '
-<link rel="stylesheet" type="text/css" href="'.util_make_url ('/themes/'.$GLOBALS['sys_theme'].'/css/theme.css').'" />
-';
-}
-echo '
+$ath->header(array('atid'=>$ath->getID()));
 
-</head>
-<body>
-<h1>'. $feedback .'</h1>
+echo '<h1>'. $feedback .'</h1>
 
+<form action="'.getStringFromServer('PHP_SELF').'?func=query&amp;group_id='.$group_id.'&amp;atid='.$ath->getID().'" method="post">
+<input type="hidden" name="form_key" value="'.form_generate_key().'" />
 <table border="3" cellpadding="4" rules="groups" frame="box" width="100%" class="tablecontent">
-	<form action="'.getStringFromServer('PHP_SELF').'?func=query&amp;group_id='.$group_id.'&amp;atid='.$ath->getID().'" method="post">
-	<input type="hidden" name="form_key" value="'.form_generate_key().'">
 	<tr>
 		<td>
 			<input type="submit" name="submit" value="'._('Save Changes').'" />
@@ -249,15 +235,15 @@
 	</tr>
 	<tr class="tablecontent">
 		<td>
-		<input type="radio" name="query_action" value="1" '.((!$query_id) ? 'checked' : '' ).'>'._('Name and Save Query').'<br />';
+		<input type="radio" name="query_action" value="1" '.((!$query_id) ? 'checked="checked"' : '' ).' />'._('Name and Save Query').'<br />';
 	if(db_numrows($res)>0) {
 		echo '
-		<input type="radio" name="query_action" value="4">'._('Load Query').'<br />';
+		<input type="radio" name="query_action" value="4" />'._('Load Query').'<br />';
 	}
 	if ($query_id) {
 		echo '
-		<input type="radio" name="query_action" value="3" checked>'._('Update Query').'<br />
-		<input type="radio" name="query_action" value="5">'._('Delete Query').'';
+		<input type="radio" name="query_action" value="3" checked="checked" />'._('Update Query').'<br />
+		<input type="radio" name="query_action" value="5" />'._('Delete Query').'';
 	}
 	echo '
 		</td>
@@ -270,7 +256,7 @@
 echo'
 <table width="100%" class="tablecontent">
 	<tr>
-		<td>'._('Assignee').'</a><br />'. $tech_box .'</td>
+		<td>'._('Assignee').'<br />'. $tech_box .'</td>
 		<td>';
 		if (!$ath->usesCustomStatuses()) {
 			echo _('State').':&nbsp;<br />'. $ath->statusBox('_status',$_status,true,_('Any'));
@@ -283,11 +269,11 @@
 	<tr>
 		<td colspan="2">'.
 		_('Last Modified Date range').':<strong>(YYYY-MM-DD&nbsp;YYYY-MM-DD Format)</strong><br />
-		<input type="text" name="_moddaterange" size="21" maxlength="21" value="'. htmlspecialchars($_moddaterange) .'"><p/>
+		<input type="text" name="_moddaterange" size="21" maxlength="21" value="'. htmlspecialchars($_moddaterange) .'" /><p/>
 		'._('Open Date range').': <strong>(YYYY-MM-DD&nbsp;YYYY-MM-DD Format)</strong><br />
-		<input type="text" name="_opendaterange" size="21" maxlength="21" value="'. htmlspecialchars($_opendaterange) .'"><p/>
+		<input type="text" name="_opendaterange" size="21" maxlength="21" value="'. htmlspecialchars($_opendaterange) .'" /><p/>
 		'._('Close Date range').': <strong>(YYYY-MM-DD&nbsp;YYYY-MM-DD Format)</strong><br />
-		<input type="text" name="_closedaterange" size="21" maxlength="21" value="'. htmlspecialchars($_closedaterange) .'">
+		<input type="text" name="_closedaterange" size="21" maxlength="21" value="'. htmlspecialchars($_closedaterange) .'" />
 		</td>
 	</tr>
 	<tr>
@@ -297,8 +283,11 @@
 		<td>&nbsp;<br />
 		'.html_build_select_box_from_arrays($sort_arr,$sort_name_arr,'_sort_ord',$_sort_ord,false) .'</td>
 	</tr>
-	</form></table></body></html>';
+	</table>
+</form>';
 
+$ath->footer(array());
+
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"



More information about the evolvis-commits mailing list