Commit 6c5f0dadcdff2d55ce6b68c49dc0db990b49fc61
1 parent
5eab9721
added javascript validation
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1164 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
17 additions
and
5 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
| @@ -45,14 +45,21 @@ function renderCheckInPage($oDocument) { | @@ -45,14 +45,21 @@ function renderCheckInPage($oDocument) { | ||
| 45 | global $default; | 45 | global $default; |
| 46 | 46 | ||
| 47 | $sToRender = "<table>\n"; | 47 | $sToRender = "<table>\n"; |
| 48 | - $sToRender .= "<tr><td>Select the file to check in:</td></tr>\n"; | ||
| 49 | - $sToRender .= "<tr><td><input type=\"file\" name=\"fFile\"></td></tr>\n"; | 48 | + $sToRender .= "<tr><td>Select the file to check in:</td></tr>\n"; |
| 49 | + $sToRender .= "<tr><td><input type=\"file\" name=\"fFile\">"; | ||
| 50 | + /* | ||
| 51 | + $sToRender .= "<tr><td><input type=\"file\" name=\"browse\" style=\"display:none\">"; | ||
| 52 | + $sToRender .= "<input type=\"text\" name=\"fFile\"\>\n"; | ||
| 53 | + $sToRender .= "<a href=\"#\" onClick=\"document.MainForm.browse.click();document.MainForm.fFile.value=document.MainForm.browse.value;return false;\">"; | ||
| 54 | + $sToRender .= "<img src=\"$default->graphicsUrl/widgets/browse.gif\" alt=\"browse\" border=\"0\"></a>\n"; | ||
| 55 | + */ | ||
| 56 | + $sToRender .= "</td></tr>\n"; | ||
| 50 | $sToRender .= "</table>\n"; | 57 | $sToRender .= "</table>\n"; |
| 51 | 58 | ||
| 52 | $sToRender .= "<table>\n"; | 59 | $sToRender .= "<table>\n"; |
| 53 | $sToRender .= "<tr><td>Enter a check in comment for '" . $oDocument->getName() . "'</td></tr>\n"; | 60 | $sToRender .= "<tr><td>Enter a check in comment for '" . $oDocument->getName() . "'</td></tr>\n"; |
| 54 | $sToRender .= "<tr/>\n"; | 61 | $sToRender .= "<tr/>\n"; |
| 55 | - $sToRender .= "<tr><td><input type=\"text\" name=\"fCheckOutComment\" size=\"30\"/></td></tr>\n"; | 62 | + $sToRender .= "<tr><td><input type=\"text\" name=\"fCheckInComment\" size=\"30\"/></td></tr>\n"; |
| 56 | $sToRender .= "<tr><td><input type=\"hidden\" name=\"fForStore\" value=\"1\"/></td></tr>\n"; | 63 | $sToRender .= "<tr><td><input type=\"hidden\" name=\"fForStore\" value=\"1\"/></td></tr>\n"; |
| 57 | $sToRender .= "<tr><td>\n"; | 64 | $sToRender .= "<tr><td>\n"; |
| 58 | $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"major\" checked /> Major CheckIn\n"; | 65 | $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"major\" checked /> Major CheckIn\n"; |
| @@ -64,7 +71,7 @@ function renderCheckInPage($oDocument) { | @@ -64,7 +71,7 @@ function renderCheckInPage($oDocument) { | ||
| 64 | $sToRender .= "<tr>\n"; | 71 | $sToRender .= "<tr>\n"; |
| 65 | $sToRender .= "</tr>\n"; | 72 | $sToRender .= "</tr>\n"; |
| 66 | $sToRender .= "<tr>\n"; | 73 | $sToRender .= "<tr>\n"; |
| 67 | - $sToRender .= "<td><input type=\"image\" src =\"$default->graphicsUrl/widgets/checkin.gif\" value=\"Submit\" />\n"; | 74 | + $sToRender .= "<td><input type=\"image\" src =\"$default->graphicsUrl/widgets/checkin.gif\" value=\"Submit\" onClick=\"if (validRequired(document.MainForm.fFile, 'Check-In File') && validRequired(document.MainForm.fCheckInComment, 'Check-In Comment')) { return confirm('Are you sure you want to overwrite " . $oDocument->getName() . " with ' + document.MainForm.fFile.value + '?'); } else return false;\"/>\n"; |
| 68 | $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td>\n"; | 75 | $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td>\n"; |
| 69 | $sToRender .= "</tr>\n"; | 76 | $sToRender .= "</tr>\n"; |
| 70 | $sToRender .= "</table>\n"; | 77 | $sToRender .= "</table>\n"; |
| @@ -89,11 +96,16 @@ function renderCheckOutPage($oDocument) { | @@ -89,11 +96,16 @@ function renderCheckOutPage($oDocument) { | ||
| 89 | $sToRender .= "<tr>\n"; | 96 | $sToRender .= "<tr>\n"; |
| 90 | $sToRender .= "</tr>\n"; | 97 | $sToRender .= "</tr>\n"; |
| 91 | $sToRender .= "<tr>\n"; | 98 | $sToRender .= "<tr>\n"; |
| 92 | - $sToRender .= "<td><input type=\"image\" src =\"$default->graphicsUrl/widgets/checkout.gif\" value=\"Submit\" />\n"; | 99 | + $sToRender .= "<td><input type=\"image\" src =\"$default->graphicsUrl/widgets/checkout.gif\" value=\"Submit\" onClick=\"return validRequired(document.MainForm.fCheckOutComment, 'Check-Out Comment');\" />\n"; |
| 93 | $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td>\n"; | 100 | $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td>\n"; |
| 94 | $sToRender .= "</tr>\n"; | 101 | $sToRender .= "</tr>\n"; |
| 95 | $sToRender .= "</table>\n"; | 102 | $sToRender .= "</table>\n"; |
| 96 | 103 | ||
| 97 | return $sToRender; | 104 | return $sToRender; |
| 98 | } | 105 | } |
| 106 | + | ||
| 107 | +function renderErrorPage($sErrorMessage) { | ||
| 108 | + return "<p class=\"errorText\">$sErrorMessage</p>\n" . | ||
| 109 | + "<a href=\"$default->rootUrl/control.php?action=addOrg\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a>\n"; | ||
| 110 | +} | ||
| 99 | ?> | 111 | ?> |