Peter M. Groen / knowledgetree

Commit 962aed59ae0827d5720e47c84ce1d831416d8c92

Authored by michael
1 parent 8db7edd1

s/viewNews/listNews 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1798 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 24 additions and 9 deletions
presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php
  View file @962aed5
@@ -52,7 +52,7 @@ if (checkSession()) { @@ -52,7 +52,7 @@ if (checkSession()) {
52 if ($oDashboardNews->create()) { 52 if ($oDashboardNews->create()) {
53 $default->log->info("addNewsBL.php successfully created dashboard news id=" . $oDashboardNews->getID()); 53 $default->log->info("addNewsBL.php successfully created dashboard news id=" . $oDashboardNews->getID());
54 // redirect to view page 54 // redirect to view page
55 - redirect("$default->rootUrl/control.php?action=viewNews"); 55 + redirect("$default->rootUrl/control.php?action=listNews");
56 } else { 56 } else {
57 // insert failed 57 // insert failed
58 $default->log->error("addNewsBL.php DB error inserting dashboard news ($fSynopsis, $fBody, $fRank, with image)"); 58 $default->log->error("addNewsBL.php DB error inserting dashboard news ($fSynopsis, $fBody, $fRank, with image)");
@@ -72,7 +72,7 @@ if (checkSession()) { @@ -72,7 +72,7 @@ if (checkSession()) {
72 // insert worked 72 // insert worked
73 $default->log->info("addNewsBL.php successfully created dashboard news id=" . $oDashboardNews->getID()); 73 $default->log->info("addNewsBL.php successfully created dashboard news id=" . $oDashboardNews->getID());
74 // redirect to view page 74 // redirect to view page
75 - redirect("$default->rootUrl/control.php?action=viewNews"); 75 + redirect("$default->rootUrl/control.php?action=listNews");
76 } else { 76 } else {
77 // insert failed 77 // insert failed
78 $default->log->error("addNewsBL.php DB error inserting dashboard news ($fSynopsis, $fBody, $fRank, no image)"); 78 $default->log->error("addNewsBL.php DB error inserting dashboard news ($fSynopsis, $fBody, $fRank, no image)");
presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php
  View file @962aed5
@@ -63,7 +63,7 @@ if (checkSession()) { @@ -63,7 +63,7 @@ if (checkSession()) {
63 if ($oDashboardNews->update()) { 63 if ($oDashboardNews->update()) {
64 $default->log->info("editNewsBL.php successfully updated dashboard news id=$fNewsID"); 64 $default->log->info("editNewsBL.php successfully updated dashboard news id=$fNewsID");
65 // redirect to view page 65 // redirect to view page
66 - redirect("$default->rootUrl/control.php?action=viewNews"); 66 + redirect("$default->rootUrl/control.php?action=listNews");
67 } else { 67 } else {
68 // update failed 68 // update failed
69 $default->log->error("editNewsBL.php DB error updating dashboard news id=$fNewsID; ($fSynopsis, $fBody, $fRank)"); 69 $default->log->error("editNewsBL.php DB error updating dashboard news id=$fNewsID; ($fSynopsis, $fBody, $fRank)");
@@ -81,7 +81,7 @@ if (checkSession()) { @@ -81,7 +81,7 @@ if (checkSession()) {
81 if ($oDashboardNews->update()) { 81 if ($oDashboardNews->update()) {
82 $default->log->info("editNewsBL.php successfully updated dashboard news id=$fNewsID"); 82 $default->log->info("editNewsBL.php successfully updated dashboard news id=$fNewsID");
83 // redirect to view page 83 // redirect to view page
84 - redirect("$default->rootUrl/control.php?action=viewNews"); 84 + redirect("$default->rootUrl/control.php?action=listNews");
85 } else { 85 } else {
86 // update failed 86 // update failed
87 $default->log->error("editNewsBL.php DB error updating dashboard news id=$fNewsID; ($fSynopsis, $fBody, $fRank)"); 87 $default->log->error("editNewsBL.php DB error updating dashboard news id=$fNewsID; ($fSynopsis, $fBody, $fRank)");
presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc
  View file @962aed5
@@ -69,7 +69,8 @@ function renderNewsItem($oDashboardNews) { @@ -69,7 +69,8 @@ function renderNewsItem($oDashboardNews) {
69 $sToRender .= "<tr><td>Synopsis:</td><td>" . $oDashboardNews->getSynopsis() . "</td></tr>"; 69 $sToRender .= "<tr><td>Synopsis:</td><td>" . $oDashboardNews->getSynopsis() . "</td></tr>";
70 $sToRender .= "<tr><td>Body:</td><td>" . $oDashboardNews->getBody() . "</td></tr>"; 70 $sToRender .= "<tr><td>Body:</td><td>" . $oDashboardNews->getBody() . "</td></tr>";
71 $sToRender .= "<tr><td>Rank:</td><td>" . $oDashboardNews->getRank() . "</td></tr>"; 71 $sToRender .= "<tr><td>Rank:</td><td>" . $oDashboardNews->getRank() . "</td></tr>";
72 - $sToRender .= "<tr><td colspan=\"2\"><img src=\"$default->rootUrl/" . $default->siteMap->getPage("viewNewsImage") . "?fNewsID=" . $oDashboardNews->getID() . "\" border=\"0\"></td></tr>"; 72 + $sToRender .= "<tr><td colspan=\"2\">" . $oDashboardNews->getImageLink() . "</td></tr>";
  73 +
73 $sToRender .= "<input type=\"hidden\" name=\"fNewsID\" value=\"" . $oDashboardNews->getID() . "\">"; 74 $sToRender .= "<input type=\"hidden\" name=\"fNewsID\" value=\"" . $oDashboardNews->getID() . "\">";
74 return $sToRender; 75 return $sToRender;
75 } 76 }
@@ -97,7 +98,7 @@ function renderEditAddNewsForm($oDashboardNews, $bUpdate) { @@ -97,7 +98,7 @@ function renderEditAddNewsForm($oDashboardNews, $bUpdate) {
97 } 98 }
98 99
99 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\" border=\"0\">\n"; 100 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\" border=\"0\">\n";
100 - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewNews\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr>\n"; 101 + $sToRender .= "<a href=\"$default->rootUrl/control.php?action=listNews\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr>\n";
101 $sToRender .= "</table>"; 102 $sToRender .= "</table>";
102 103
103 $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n"; 104 $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
@@ -167,7 +168,7 @@ function renderPreviewNewsPage($oDashboardNews) { @@ -167,7 +168,7 @@ function renderPreviewNewsPage($oDashboardNews) {
167 $sToRender .= "<table width=\"600\">" . renderHeading("Preview Dashboard News") . "</table>"; 168 $sToRender .= "<table width=\"600\">" . renderHeading("Preview Dashboard News") . "</table>";
168 $sToRender .= "<table>\n"; 169 $sToRender .= "<table>\n";
169 $sToRender .= renderNewsItem($oDashboardNews); 170 $sToRender .= renderNewsItem($oDashboardNews);
170 - $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=viewNews\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"></a></td></tr>\n"; 171 + $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=listNews\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"></a></td></tr>\n";
171 $sToRender .= "</table>\n"; 172 $sToRender .= "</table>\n";
172 return $sToRender; 173 return $sToRender;
173 } 174 }
@@ -186,9 +187,23 @@ function renderDeleteNewsConfirmationPage($oDashboardNews) { @@ -186,9 +187,23 @@ function renderDeleteNewsConfirmationPage($oDashboardNews) {
186 187
187 $sToRender .= "<input type=\"hidden\" name=\"fDeleteConfirmed\" value=\"1\">"; 188 $sToRender .= "<input type=\"hidden\" name=\"fDeleteConfirmed\" value=\"1\">";
188 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/delete.gif\" border=\"0\">\n"; 189 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/delete.gif\" border=\"0\">\n";
189 - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewNews\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr>\n"; 190 + $sToRender .= "<a href=\"$default->rootUrl/control.php?action=listNews\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr>\n";
190 191
191 $sToRender .= "</table>\n"; 192 $sToRender .= "</table>\n";
192 return $sToRender; 193 return $sToRender;
193 } 194 }
  195 +
  196 +/**
  197 + * Displays a news item.
  198 + */
  199 +function renderNewsItemPage($oDashboardNews) {
  200 + global $default;
  201 +
  202 + $sToRender .= "<table>\n";
  203 + $sToRender .= renderNewsItem($oDashboardNews);
  204 + //$sToRender .= "<tr><td><a href=\"javascript:window.close()"><img src=\"$default->graphicsUrl/widgets/close.gif\" border=\"0\"></a></td></tr>\n";
  205 + $sToRender .= "<tr><td><a href=\"javascript:window.close()\">close</a></td></tr>\n";
  206 + $sToRender .= "</table>\n";
  207 + return $sToRender;
  208 +}
194 ?> 209 ?>
195 \ No newline at end of file 210 \ No newline at end of file
presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php
  View file @962aed5
@@ -33,7 +33,7 @@ if (checkSession()) { @@ -33,7 +33,7 @@ if (checkSession()) {
33 if ($oDashboardNews->delete()) { 33 if ($oDashboardNews->delete()) {
34 $default->log->info("deleteNewsBL.php successfully deleted dashboard news id=$fNewsID"); 34 $default->log->info("deleteNewsBL.php successfully deleted dashboard news id=$fNewsID");
35 // redirect to view page 35 // redirect to view page
36 - redirect("$default->rootUrl/control.php?action=viewNews"); 36 + redirect("$default->rootUrl/control.php?action=listNews");
37 } else { 37 } else {
38 // delete failed 38 // delete failed
39 $default->log->error("deleteNewsBL.php DB error deleting dashboard news (" . arrayToString($oDashboardNews) . ")"); 39 $default->log->error("deleteNewsBL.php DB error deleting dashboard news (" . arrayToString($oDashboardNews) . ")");