[evolvis-commits] r17599: Make relation view of tasks and tracker items similar

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Oct 20 18:26:48 CEST 2011


Author: mirabilos
Date: 2011-10-20 18:26:48 +0200 (Thu, 20 Oct 2011)
New Revision: 17599

Modified:
   branches/ev48fixes/debian/changelog
   branches/ev48fixes/translations/de.po
   branches/ev48fixes/translations/gforge.pot
   branches/ev48fixes/www/pm/include/ProjectTaskHTML.class.php
Log:
Make relation view of tasks and tracker items similar

Modified: branches/ev48fixes/debian/changelog
===================================================================
--- branches/ev48fixes/debian/changelog	2011-10-20 16:08:26 UTC (rev 17598)
+++ branches/ev48fixes/debian/changelog	2011-10-20 16:26:48 UTC (rev 17599)
@@ -1,3 +1,9 @@
+gforge (4.8.3+evolvis36+fixes4) unstable; urgency=low
+
+  * Make relation view of tasks and tracker items similar
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 20 Oct 2011 18:26:37 +0200
+
 gforge (4.8.3+evolvis36+fixes3) unstable; urgency=low
 
   [ Thorsten Glaser ]

Modified: branches/ev48fixes/translations/de.po
===================================================================
--- branches/ev48fixes/translations/de.po	2011-10-20 16:08:26 UTC (rev 17598)
+++ branches/ev48fixes/translations/de.po	2011-10-20 16:26:48 UTC (rev 17599)
@@ -3,8 +3,8 @@
 msgstr ""
 "Project-Id-Version: EvolvisForge 4.8.3+evolvis36\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-20 14:22+0200\n"
-"PO-Revision-Date: 2011-09-02 15:14+0200\n"
+"POT-Creation-Date: 2011-10-20 18:24+0200\n"
+"PO-Revision-Date: 2011-10-20 18:26+0200\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
 "Language: de\n"
@@ -1569,7 +1569,7 @@
 #: common/reporting/report_utils.php:160 www/export/rssMyPage.php:123
 #: www/include/Layout.class.php:605 www/include/project_home.php:321
 #: www/include/project_home.php:322
-#: www/pm/include/ProjectTaskHTML.class.php:127
+#: www/pm/include/ProjectTaskHTML.class.php:131
 #: www/themes/evolvis/Theme.class.php:366
 #: www/themes/evolvis/Theme.class.php:367
 #: www/themes/gforge-simple-theme/Theme.class.php:519
@@ -2159,7 +2159,7 @@
 #: www/news/admin/index.php:129 www/people/editjob.php:172
 #: www/people/viewjob.php:76 www/pm/browse_task.php:304
 #: www/pm/browse_task.php:422 www/pm/detail_task.php:134
-#: www/pm/ganttpage.php:167 www/pm/include/ProjectTaskHTML.class.php:128
+#: www/pm/ganttpage.php:167 www/pm/include/ProjectTaskHTML.class.php:132
 #: www/pm/include/pm_columns.php:38 www/pm/mod_task.php:148
 #: www/reporting/usersummary.php:107
 #: www/tracker/admin/form-addextrafield.php:91
@@ -4148,8 +4148,8 @@
 msgid "Time"
 msgstr "Zeit"
 
-#: www/activity/index.php:172 www/pm/include/ProjectTaskHTML.class.php:175
-#: www/pm/include/ProjectTaskHTML.class.php:215
+#: www/activity/index.php:172 www/pm/include/ProjectTaskHTML.class.php:181
+#: www/pm/include/ProjectTaskHTML.class.php:221
 #: www/project/admin/project_admin_utils.php:177 www/tracker/detail.php:229
 #: www/tracker/include/ArtifactHtml.class.php:106
 #: www/tracker/mod-limited.php:207 www/tracker/mod.php:316
@@ -4471,8 +4471,8 @@
 #: www/forum/forum.php:238 www/forum/include/ForumHTML.class.php:68
 #: www/forum/message.php:141 www/frs/admin/showreleases.php:102
 #: www/include/project_home.php:223 www/news/admin/news_admin_utils.php:58
-#: www/pm/calendar.php:271 www/pm/include/ProjectTaskHTML.class.php:174
-#: www/pm/include/ProjectTaskHTML.class.php:214
+#: www/pm/calendar.php:271 www/pm/include/ProjectTaskHTML.class.php:180
+#: www/pm/include/ProjectTaskHTML.class.php:220
 #: www/project/admin/project_admin_utils.php:176
 #: www/project/stats/project_stats_utils.php:75 www/reporting/timeadd.php:138
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:46
@@ -4979,7 +4979,8 @@
 #: www/admin/massmail.php:143 www/admin/search.php:92 www/admin/search.php:163
 #: www/docman/admin/index.php:372 www/export/rssMyPage.php:125
 #: www/my/index.php:82 www/my/index.php:129 www/my/index.php:182
-#: www/pm/index.php:95 www/project/admin/editimages.php:259
+#: www/pm/include/ProjectTaskHTML.class.php:129 www/pm/index.php:95
+#: www/project/admin/editimages.php:259
 #: www/tracker/admin/form-addcanned.php:23 www/tracker/browse.php:246
 #: www/tracker/browse.php:476 www/tracker/query.php:167
 msgid "ID"
@@ -6124,7 +6125,7 @@
 msgstr "Details:"
 
 #: www/export/rssAboTask.php:161 www/help/tracker.php:69
-#: www/news/news_utils.php:178 www/pm/include/ProjectTaskHTML.class.php:173
+#: www/news/news_utils.php:178 www/pm/include/ProjectTaskHTML.class.php:179
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -8238,11 +8239,11 @@
 "evolvis stems from the latin verb \"evolvere\" and means \"you evolve\". "
 "\"Evolution\" as well traces back to this word.<br />evolvis.org is a free "
 "project platform for free software projects, the publicly available instance "
-"of the Evolvis platform provided by tarent solutions GmbH. Here developers and other "
-"project participants can find everything that is needed for a free software "
-"project:<br />source code management, discussion board, bug tracking, "
-"release and document management, downloads and <a href=\"http://info.evolvis."
-"org/\">more</a>."
+"of the Evolvis platform provided by tarent solutions GmbH. Here developers "
+"and other project participants can find everything that is needed for a free "
+"software project:<br />source code management, discussion board, bug "
+"tracking, release and document management, downloads and <a href=\"http://"
+"info.evolvis.org/\">more</a>."
 msgstr ""
 
 #: www/index_std.php:14
@@ -9710,7 +9711,7 @@
 msgid "Contact Info"
 msgstr "Kontakt Information"
 
-#: www/people/viewjob.php:81 www/pm/include/ProjectTaskHTML.class.php:129
+#: www/people/viewjob.php:81 www/pm/include/ProjectTaskHTML.class.php:133
 #: www/project/report/index.php:137 www/tracker/browse.php:249
 #: www/tracker/browse.php:482 www/tracker/query.php:170
 msgid "Open Date"
@@ -9755,8 +9756,7 @@
 #: www/pm/add_task.php:62 www/pm/browse_task.php:222
 #: www/pm/browse_task.php:408 www/pm/detail_task.php:87
 #: www/pm/ganttpage.php:79 www/pm/include/ProjectTaskHTML.class.php:90
-#: www/pm/include/ProjectTaskHTML.class.php:126 www/pm/mod_task.php:167
-#: www/tracker/detail.php:164 www/tracker/mod.php:253
+#: www/pm/mod_task.php:167 www/tracker/detail.php:164 www/tracker/mod.php:253
 msgid "Task Summary"
 msgstr "Zusammenfassung der Aufgabe"
 
@@ -10311,56 +10311,60 @@
 msgid "Related Tracker Items"
 msgstr "Verwandte Tracker Elemente"
 
+#: www/pm/include/ProjectTaskHTML.class.php:125 www/tracker/mod.php:250
+msgid "Tick a checkbox to remove that task<->tracker relation."
+msgstr "Kreuzen Sie an, um diese Task<->Bug-Verknüpfung zu entfernen."
+
 #: www/pm/include/ProjectTaskHTML.class.php:130
-msgid "Remove Relation"
-msgstr "Entferne Beziehung"
+msgid "Item Summary"
+msgstr "Elementkurzbeschreibung"
 
-#: www/pm/include/ProjectTaskHTML.class.php:148
+#: www/pm/include/ProjectTaskHTML.class.php:154
 msgid "No Related Tracker Items Have Been Added"
 msgstr "Es wurden keine verwandten Tracker Elemente hinzugefügt"
 
-#: www/pm/include/ProjectTaskHTML.class.php:161 www/tracker/detail.php:111
+#: www/pm/include/ProjectTaskHTML.class.php:167 www/tracker/detail.php:111
 #: www/tracker/mod-limited.php:143 www/tracker/mod.php:198
 msgid "Followup"
 msgstr "Nachfolgender"
 
-#: www/pm/include/ProjectTaskHTML.class.php:165 www/tracker/detail.php:115
+#: www/pm/include/ProjectTaskHTML.class.php:171 www/tracker/detail.php:115
 #: www/tracker/mod-limited.php:147 www/tracker/mod.php:202
 msgid "Sort comments antichronologically"
 msgstr "Sortiere Kommentare neueste zuerst"
 
-#: www/pm/include/ProjectTaskHTML.class.php:169 www/tracker/detail.php:119
+#: www/pm/include/ProjectTaskHTML.class.php:175 www/tracker/detail.php:119
 #: www/tracker/mod-limited.php:151 www/tracker/mod.php:206
 msgid "Sort comments chronologically"
 msgstr "Sortiere Kommentare älteste zuerst"
 
-#: www/pm/include/ProjectTaskHTML.class.php:193
+#: www/pm/include/ProjectTaskHTML.class.php:199
 msgid "No Comments Have Been Added"
 msgstr "Es wurden keine Kommentare abgegeben"
 
-#: www/pm/include/ProjectTaskHTML.class.php:208
+#: www/pm/include/ProjectTaskHTML.class.php:214
 msgid "Task Change History"
 msgstr "Auftgabenänderungs-Verlauf"
 
-#: www/pm/include/ProjectTaskHTML.class.php:211
+#: www/pm/include/ProjectTaskHTML.class.php:217
 #: www/project/admin/project_admin_utils.php:173
 #: www/tracker/include/ArtifactHtml.class.php:102
 msgid "Field"
 msgstr "Feld"
 
-#: www/pm/include/ProjectTaskHTML.class.php:212
+#: www/pm/include/ProjectTaskHTML.class.php:218
 #: www/project/admin/project_admin_utils.php:174
 #: www/tracker/include/ArtifactHtml.class.php:103
 msgid "Old Value"
 msgstr "Alter Wert"
 
-#: www/pm/include/ProjectTaskHTML.class.php:213
+#: www/pm/include/ProjectTaskHTML.class.php:219
 #: www/project/admin/project_admin_utils.php:175
 #: www/tracker/include/ArtifactHtml.class.php:104
 msgid "New Value"
 msgstr "Neuer Wert"
 
-#: www/pm/include/ProjectTaskHTML.class.php:240
+#: www/pm/include/ProjectTaskHTML.class.php:246
 msgid "No Changes Have Been Made"
 msgstr "Es wurden keine Änderungen gemacht"
 
@@ -14324,10 +14328,6 @@
 msgid "Use Canned Response"
 msgstr "Benutze vorgespeicherte Antwort"
 
-#: www/tracker/mod.php:250
-msgid "Tick a checkbox to remove that task<->tracker relation."
-msgstr "Kreuzen Sie an, um diese Task<->Bug-Verknüpfung zu entfernen."
-
 #: www/tracker/mod.php:294
 msgid "Existing Files"
 msgstr "Existente Dateien"

Modified: branches/ev48fixes/translations/gforge.pot
===================================================================
--- branches/ev48fixes/translations/gforge.pot	2011-10-20 16:08:26 UTC (rev 17598)
+++ branches/ev48fixes/translations/gforge.pot	2011-10-20 16:26:48 UTC (rev 17599)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 18:08+0200\n"
+"POT-Creation-Date: 2011-10-20 18:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1446,7 +1446,7 @@
 #: common/reporting/report_utils.php:160 www/export/rssMyPage.php:123
 #: www/include/Layout.class.php:605 www/include/project_home.php:321
 #: www/include/project_home.php:322
-#: www/pm/include/ProjectTaskHTML.class.php:127
+#: www/pm/include/ProjectTaskHTML.class.php:131
 #: www/themes/evolvis/Theme.class.php:366
 #: www/themes/evolvis/Theme.class.php:367
 #: www/themes/gforge-simple-theme/Theme.class.php:519
@@ -2013,7 +2013,7 @@
 #: www/news/admin/index.php:129 www/people/editjob.php:172
 #: www/people/viewjob.php:76 www/pm/browse_task.php:304
 #: www/pm/browse_task.php:422 www/pm/detail_task.php:134
-#: www/pm/ganttpage.php:167 www/pm/include/ProjectTaskHTML.class.php:128
+#: www/pm/ganttpage.php:167 www/pm/include/ProjectTaskHTML.class.php:132
 #: www/pm/include/pm_columns.php:38 www/pm/mod_task.php:148
 #: www/reporting/usersummary.php:107
 #: www/tracker/admin/form-addextrafield.php:91
@@ -3746,8 +3746,8 @@
 msgid "Time"
 msgstr ""
 
-#: www/activity/index.php:172 www/pm/include/ProjectTaskHTML.class.php:175
-#: www/pm/include/ProjectTaskHTML.class.php:215
+#: www/activity/index.php:172 www/pm/include/ProjectTaskHTML.class.php:181
+#: www/pm/include/ProjectTaskHTML.class.php:221
 #: www/project/admin/project_admin_utils.php:177 www/tracker/detail.php:229
 #: www/tracker/include/ArtifactHtml.class.php:106
 #: www/tracker/mod-limited.php:207 www/tracker/mod.php:316
@@ -4063,8 +4063,8 @@
 #: www/forum/forum.php:238 www/forum/include/ForumHTML.class.php:68
 #: www/forum/message.php:141 www/frs/admin/showreleases.php:102
 #: www/include/project_home.php:223 www/news/admin/news_admin_utils.php:58
-#: www/pm/calendar.php:271 www/pm/include/ProjectTaskHTML.class.php:174
-#: www/pm/include/ProjectTaskHTML.class.php:214
+#: www/pm/calendar.php:271 www/pm/include/ProjectTaskHTML.class.php:180
+#: www/pm/include/ProjectTaskHTML.class.php:220
 #: www/project/admin/project_admin_utils.php:176
 #: www/project/stats/project_stats_utils.php:75 www/reporting/timeadd.php:138
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:46
@@ -4565,7 +4565,8 @@
 #: www/admin/massmail.php:143 www/admin/search.php:92 www/admin/search.php:163
 #: www/docman/admin/index.php:372 www/export/rssMyPage.php:125
 #: www/my/index.php:82 www/my/index.php:129 www/my/index.php:182
-#: www/pm/index.php:95 www/project/admin/editimages.php:259
+#: www/pm/include/ProjectTaskHTML.class.php:129 www/pm/index.php:95
+#: www/project/admin/editimages.php:259
 #: www/tracker/admin/form-addcanned.php:23 www/tracker/browse.php:246
 #: www/tracker/browse.php:476 www/tracker/query.php:167
 msgid "ID"
@@ -5641,7 +5642,7 @@
 msgstr ""
 
 #: www/export/rssAboTask.php:161 www/help/tracker.php:69
-#: www/news/news_utils.php:178 www/pm/include/ProjectTaskHTML.class.php:173
+#: www/news/news_utils.php:178 www/pm/include/ProjectTaskHTML.class.php:179
 msgid "Comment"
 msgstr ""
 
@@ -8974,7 +8975,7 @@
 msgid "Contact Info"
 msgstr ""
 
-#: www/people/viewjob.php:81 www/pm/include/ProjectTaskHTML.class.php:129
+#: www/people/viewjob.php:81 www/pm/include/ProjectTaskHTML.class.php:133
 #: www/project/report/index.php:137 www/tracker/browse.php:249
 #: www/tracker/browse.php:482 www/tracker/query.php:170
 msgid "Open Date"
@@ -9018,8 +9019,7 @@
 #: www/pm/add_task.php:62 www/pm/browse_task.php:222
 #: www/pm/browse_task.php:408 www/pm/detail_task.php:87
 #: www/pm/ganttpage.php:79 www/pm/include/ProjectTaskHTML.class.php:90
-#: www/pm/include/ProjectTaskHTML.class.php:126 www/pm/mod_task.php:167
-#: www/tracker/detail.php:164 www/tracker/mod.php:253
+#: www/pm/mod_task.php:167 www/tracker/detail.php:164 www/tracker/mod.php:253
 msgid "Task Summary"
 msgstr ""
 
@@ -9549,56 +9549,60 @@
 msgid "Related Tracker Items"
 msgstr ""
 
+#: www/pm/include/ProjectTaskHTML.class.php:125 www/tracker/mod.php:250
+msgid "Tick a checkbox to remove that task<->tracker relation."
+msgstr ""
+
 #: www/pm/include/ProjectTaskHTML.class.php:130
-msgid "Remove Relation"
+msgid "Item Summary"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:148
+#: www/pm/include/ProjectTaskHTML.class.php:154
 msgid "No Related Tracker Items Have Been Added"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:161 www/tracker/detail.php:111
+#: www/pm/include/ProjectTaskHTML.class.php:167 www/tracker/detail.php:111
 #: www/tracker/mod-limited.php:143 www/tracker/mod.php:198
 msgid "Followup"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:165 www/tracker/detail.php:115
+#: www/pm/include/ProjectTaskHTML.class.php:171 www/tracker/detail.php:115
 #: www/tracker/mod-limited.php:147 www/tracker/mod.php:202
 msgid "Sort comments antichronologically"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:169 www/tracker/detail.php:119
+#: www/pm/include/ProjectTaskHTML.class.php:175 www/tracker/detail.php:119
 #: www/tracker/mod-limited.php:151 www/tracker/mod.php:206
 msgid "Sort comments chronologically"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:193
+#: www/pm/include/ProjectTaskHTML.class.php:199
 msgid "No Comments Have Been Added"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:208
+#: www/pm/include/ProjectTaskHTML.class.php:214
 msgid "Task Change History"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:211
+#: www/pm/include/ProjectTaskHTML.class.php:217
 #: www/project/admin/project_admin_utils.php:173
 #: www/tracker/include/ArtifactHtml.class.php:102
 msgid "Field"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:212
+#: www/pm/include/ProjectTaskHTML.class.php:218
 #: www/project/admin/project_admin_utils.php:174
 #: www/tracker/include/ArtifactHtml.class.php:103
 msgid "Old Value"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:213
+#: www/pm/include/ProjectTaskHTML.class.php:219
 #: www/project/admin/project_admin_utils.php:175
 #: www/tracker/include/ArtifactHtml.class.php:104
 msgid "New Value"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:240
+#: www/pm/include/ProjectTaskHTML.class.php:246
 msgid "No Changes Have Been Made"
 msgstr ""
 
@@ -13236,10 +13240,6 @@
 msgid "Use Canned Response"
 msgstr ""
 
-#: www/tracker/mod.php:250
-msgid "Tick a checkbox to remove that task<->tracker relation."
-msgstr ""
-
 #: www/tracker/mod.php:294
 msgid "Existing Files"
 msgstr ""

Modified: branches/ev48fixes/www/pm/include/ProjectTaskHTML.class.php
===================================================================
--- branches/ev48fixes/www/pm/include/ProjectTaskHTML.class.php	2011-10-20 16:08:26 UTC (rev 17598)
+++ branches/ev48fixes/www/pm/include/ProjectTaskHTML.class.php	2011-10-20 16:26:48 UTC (rev 17599)
@@ -121,24 +121,30 @@
 			}
 
 			echo '<h3>'._('Related Tracker Items').'</h3>';
+			if ($is_admin) {
+				echo '<p>'.htmlspecialchars(_('Tick a checkbox to remove that task<->tracker relation.'))."</p>\n";
+			}
 
 			$title_arr=array();
-			$title_arr[]=_('Task Summary');
+			$title_arr[]=_('ID');
+			$title_arr[]=_('Item Summary');
 			$title_arr[]=_('Tracker');
 			$title_arr[]=_('Status');
 			$title_arr[]=_('Open Date');
-			(($is_admin) ? $title_arr[]=_('Remove Relation') : '');
 		
 			echo $GLOBALS['HTML']->listTableTop ($title_arr);
 
 			for ($i=0; $i < $rows; $i++) {
+				$subaid = db_result($res,$i,'artifact_id');
 				echo '
 				<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'>
-					<td>'.util_make_link ('/tracker/?func=detail&aid='.db_result($res,$i,'artifact_id').'&group_id='.db_result($res,$i,'group_id').'&atid='.db_result($res,$i,'group_artifact_id'), db_result($res,$i,'summary')).'</td>
+					<td>'.(($is_admin) ?
+					    '<input type="checkbox" name="rem_artifact_id[]" value="'.$subaid.'" />' :
+					    '').$subaid.'</td>
+					<td>'.util_make_link ('/tracker/?func=detail&aid='.$subaid.'&group_id='.db_result($res,$i,'group_id').'&atid='.db_result($res,$i,'group_artifact_id'), db_result($res,$i,'summary')).'</td>
 					<td>'. db_result($res,$i,'name') .'</td>
 					<td>'. db_result($res,$i,'status_name') . '</td>
 					<td>'. datepick_format(db_result($res,$i,'open_date'), true) .'</td>'.
-					(($is_admin) ? '<td><input type="checkbox" name="rem_artifact_id[]" value="'.db_result($res,$i,'artifact_id').'" /></td>' : '').
 					'</tr>';
 			}
 



More information about the evolvis-commits mailing list