[Rt-commit] [svn] r1330 - in rtfm/branches/2.1-TESTING/html: NoAuth RTFM/Article/Elements RTFM/Elements

[alexmv at pallas.eruditorum.org]

Author: alexmv
Date: Thu Aug 12 16:52:40 2004
New Revision: 1330

Modified:
   rtfm/branches/2.1-TESTING/html/NoAuth/webrtfm.css
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/Preformatted
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/ShowCustomFields
   rtfm/branches/2.1-TESTING/html/RTFM/Elements/Tabs
Log:
 * Modify custom field display in articles to use more classes and IDs

 * Merge bugfixes forward from 2.0

 * Add "header" callback just inside main div


Modified: rtfm/branches/2.1-TESTING/html/NoAuth/webrtfm.css
==============================================================================
--- rtfm/branches/2.1-TESTING/html/NoAuth/webrtfm.css	(original)
+++ rtfm/branches/2.1-TESTING/html/NoAuth/webrtfm.css	Thu Aug 12 16:52:40 2004
@@ -1,2 +1,5 @@
-.emphasized td { font-weight: bolder; color: #c00}
-.de-emphasized td { color: #999; }
+#cfs .emphasized    td { font-weight: bold;    color: #c00; font-size: 11pt; }
+#cfs .emphasized    th { font-weight: bolder;  color: #c00; font-size: 13pt; }
+
+#cfs .de-emphasized td { font-weight: lighter; color: #999; font-size:  9pt; }
+#cfs .de-emphasized th { font-weight: normal;  color: #999; font-size: 11pt; }

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/Preformatted
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/Preformatted	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/Preformatted	Thu Aug 12 16:52:40 2004
@@ -27,7 +27,7 @@
 % my $values = $Article->CustomFieldValues($cf->Id);
 % if ($cf->Type eq 'TextSingle') {
 % my $value = $values->First; 
-% my $content = $value->Content;
+% my $content = $value ? $value->Content : "";
 % if ($content =~ /<(.{1,5})>/) {
 %    $content = de_htmlify($content);
 % }
@@ -36,7 +36,7 @@
 <%$content%>
 % } else {
 % my $val = $values->Next;
-% my $content = $val->Content;
+% my $content = $val ? $val->Content : "";
 % if ($content =~ /<(.{1,5})>/) {
 %    $content = de_htmlify($content);
 % }

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/ShowCustomFields
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/ShowCustomFields	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/ShowCustomFields	Thu Aug 12 16:52:40 2004
@@ -16,7 +16,7 @@
 %# 
 %# END LICENSE BLOCK
 
-<table>
+<table id="cfs">
 % while (my $cf = $cfs->Next) {
 %   my $values = $article->CustomFieldValues($cf->Id);
 %   my $class_cf = RT::FM::ClassCustomField->new($session{'CurrentUser'});
@@ -25,7 +25,7 @@
 %   next if $display eq "Hidden";
 %   next if $display eq "Hidden when empty" and not $values->Count;
 <tr class="<% (split(' ',$display))[-1] %>">
-<td valign=top><b><%$cf->Name%></b></td>
+<th valign="top"><%$cf->Name%></th>
 <td>
 <% ($cf->Type !~ /Single$/) && '<ul>' |n%>
 <%perl>

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Elements/Tabs
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Elements/Tabs	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Elements/Tabs	Thu Aug 12 16:52:40 2004
@@ -28,6 +28,7 @@
     subactions => $subactions,
     title => $Title
 &>
+<& /Elements/Callback, %ARGS, _CallbackName => "Header" &>
 <%INIT>
 my $action;