Peter M. Groen / knowledgetree

Commit fff6504b38abb01437df8b90a47d546d166fa636

Authored by Michael Joseph
1 parent 6e42f9be

(#2813) incorporated addNews link 

used refactored cancel button function


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2511 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php
  View file @fff6504
@@ -7,6 +7,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); @@ -7,6 +7,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
7 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); 7 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
8 require_once("$default->uiDirectory/administration/news/newsUI.inc"); 8 require_once("$default->uiDirectory/administration/news/newsUI.inc");
9 require_once("$default->fileSystemRoot/presentation/Html.inc"); 9 require_once("$default->fileSystemRoot/presentation/Html.inc");
  10 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
10 11
11 /** 12 /**
12 * $Id$ 13 * $Id$
presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc
  View file @fff6504
@@ -39,7 +39,6 @@ function renderNewsTable() { @@ -39,7 +39,6 @@ function renderNewsTable() {
39 7=> "$default->rootUrl/control.php?action=removeNews"); 39 7=> "$default->rootUrl/control.php?action=removeNews");
40 40
41 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "100%", $aLinkURLs,$aDBColumnArray,$aQueryStringVariableNames); 41 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "100%", $aLinkURLs,$aDBColumnArray,$aQueryStringVariableNames);
42 - $oPatternTableSqlQuery->setTableHeading("Dashboard News");  
43 $oPatternTableSqlQuery->setDisplayColumnHeadings(true); 42 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
44 return $oPatternTableSqlQuery->render(); 43 return $oPatternTableSqlQuery->render();
45 } 44 }
@@ -79,7 +78,7 @@ function renderEditAddNewsForm($oDashboardNews) { @@ -79,7 +78,7 @@ function renderEditAddNewsForm($oDashboardNews) {
79 $sToRender .= ($oDashboardNews ? "<input type=\"hidden\" name=\"fNewsID\" value=\"" . $oDashboardNews->getID() . "\">" : ""); 78 $sToRender .= ($oDashboardNews ? "<input type=\"hidden\" name=\"fNewsID\" value=\"" . $oDashboardNews->getID() . "\">" : "");
80 79
81 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\" border=\"0\">\n"; 80 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\" border=\"0\">\n";
82 - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=listNews\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr>\n"; 81 + $sToRender .= getCancelButton("listNews") . "</td></tr>\n";
83 $sToRender .= "</table>"; 82 $sToRender .= "</table>";
84 83
85 $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n"; 84 $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
@@ -134,6 +133,7 @@ function renderListNewsPage() { @@ -134,6 +133,7 @@ function renderListNewsPage() {
134 global $default; 133 global $default;
135 134
136 $sToRender .= renderHeading("List Dashboard News"); 135 $sToRender .= renderHeading("List Dashboard News");
  136 + $sToRender .= getAddLink("addNews", "Add Dashboard News Item");
137 $sToRender .= "<table>\n"; 137 $sToRender .= "<table>\n";
138 $sToRender .= renderNewsTable(); 138 $sToRender .= renderNewsTable();
139 $sToRender .= "</table>\n"; 139 $sToRender .= "</table>\n";
@@ -169,7 +169,7 @@ function renderDeleteNewsConfirmationPage($oDashboardNews) { @@ -169,7 +169,7 @@ function renderDeleteNewsConfirmationPage($oDashboardNews) {
169 169
170 $sToRender .= "<input type=\"hidden\" name=\"fDeleteConfirmed\" value=\"1\">"; 170 $sToRender .= "<input type=\"hidden\" name=\"fDeleteConfirmed\" value=\"1\">";
171 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/delete.gif\" border=\"0\">\n"; 171 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/delete.gif\" border=\"0\">\n";
172 - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=listNews\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr>\n"; 172 + $sToRender .= getCancelButton("listNews") . "</td></tr>\n";
173 173
174 $sToRender .= "</table>\n"; 174 $sToRender .= "</table>\n";
175 return $sToRender; 175 return $sToRender;