[Rt-commit] r3153 - in rtfm/branches/2.1-TESTING: . html/RTFM/Article html/RTFM/Article/Elements

[jesse at bestpractical.com]

Author: jesse
Date: Tue Jun 14 14:38:14 2005
New Revision: 3153

Modified:
   rtfm/branches/2.1-TESTING/   (props changed)
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Edit.html
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditTopics
Log:


Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Edit.html
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Edit.html	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Edit.html	Tue Jun 14 14:38:14 2005
@@ -60,9 +60,8 @@
                         ClassObj => $ArticleObj->Id ? $ArticleObj->ClassObj : $ClassObj,
                         OnlyThisClass => 1,
                         %ARGS,
-                        id =>$id
+                        id => $id
                         &>
-
 <& /Elements/Submit, Label => ($id eq 'new' ? loc('Create') : loc('Save Changes')), color => "#993333" &>
 </form>
 </table>

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditTopics
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditTopics	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditTopics	Tue Jun 14 14:38:14 2005
@@ -26,7 +26,8 @@
 <select multiple size="<% $rows > 10 ? 10 : $rows %>" name="Topics">
 <%perl>
 if ($ClassObj->Id) {
-   $m->print("<optgroup label=\"Current class (".$ClassObj->Name.")\">");
+   $m->print("<optgroup label=\"Current class (".$ClassObj->Name.")\">")
+     unless $OnlyThisClass;
    $inTree->traverse(sub {
      my $tree = shift;
      my $topic = $tree->getNodeValue;
@@ -35,6 +36,7 @@
        .("&nbsp;" x ($tree->getDepth*5)).$topic->Name."</option>\n");
    });
  }
+ unless ($OnlyThisClass) {
  my $class = $ClassObj->Id;
  $otherTree->traverse(sub {
    my $tree = shift;