そろそろ再完成

[newbbs/newbbs.git] / WebModuleUnit1.pas

diff --git a/WebModuleUnit1.pas b/WebModuleUnit1.pas
index feaf2dd..88042aa 100644 (file)
--- a/WebModuleUnit1.pas
+++ b/WebModuleUnit1.pas
@@ -62,14 +62,14 @@ type
     FDTable1: TFDTable;
     FDTable1DBNUM: TIntegerField;
     FDTable1DATABASE: TWideStringField;
-    FDTable5ID: TIntegerField;
-    FDTable5NAME: TWideStringField;
-    FDTable5SOURCE: TBlobField;
     login: TPageProducer;
     footer: TPageProducer;
     FDGUIxWaitCursor1: TFDGUIxWaitCursor;
     FDQuery1: TFDQuery;
     FDTable3mente: TSmallintField;
+    FDTable5id: TIntegerField;
+    FDTable5name: TWideStringField;
+    FDTable5source: TWideMemoField;
     procedure indexHTMLTag(Sender: TObject; Tag: TTag; const TagString: string;
       TagParams: TStrings; var ReplaceText: string);
     procedure WebModule1indexpageAction(Sender: TObject; Request: TWebRequest;
@@ -151,6 +151,7 @@ type
     procedure pages(count: Integer; var page: Integer);
     procedure strsCheck(var Error: string; list: TStringList);
     procedure setLastArticle;
+    function footerLink(Data: array of const): string;
     function isInfo: Boolean;
     function loginCheck: Boolean;
     function hash(str: string): string;
@@ -196,7 +197,12 @@ procedure TWebModule1.adminFormatCell(Sender: TObject;
   var CustomAttrs, CellData: string);
 begin
   if CellRow = 0 then
+  begin
+    BgColor:='Silver';
     Exit;
+  end;
+  if CellRow mod 2 = 0 then
+    BgColor:='snow';
   case CellColumn of
     0:
       CellData := Format('<input name=check%d type=checkbox>', [CellRow]);
@@ -272,25 +278,38 @@ procedure TWebModule1.footerHTMLTag(Sender: TObject; Tag: TTag;
   const TagString: string; TagParams: TStrings; var ReplaceText: string);
 var
   i: Integer;
+  s: shortstring;
+  x: Boolean;
 begin
   if TagString = 'link' then
   begin
     for i := 1 to 10 do
-      if i = index.Tag then
-        ReplaceText := ReplaceText + ' ' + i.ToString + ' '
-      else
-        ReplaceText := ReplaceText +
-          Format(' <a style=text-decoration-line:none href="%s?db=%d&num=%d">%d</a> ',
-          [Request.ScriptName + PString(Self.Tag)^,
-          FDTable1.FieldByName('dbnum').AsInteger, i, i]);
-  end
-  else if TagString = 'recent' then
-    if index.Tag = -1 then
-      ReplaceText := TagString
-    else
-      ReplaceText := '<a style=text-decoration-line:none href="' +
-        Request.ScriptName + PString(Self.Tag)^ + '?db=' +
-        FDTable1.FieldByName('dbnum').AsString + '">recent</a>';
+    begin
+      x := i = index.Tag;
+      ReplaceText := ReplaceText + footerLink([i, i, x]);
+    end;
+    x := index.Tag = -1;
+    s:='\82³\82¢\82²';
+    ReplaceText := ReplaceText + footerLink([-1, s, x]);
+  end;
+end;
+
+function TWebModule1.footerLink(Data: array of const): string;
+var
+  s, t: string;
+begin
+  if data[1].VType = vtInteger then
+    t:=data[1].VInteger.toString
+  else
+    t:=data[1].VString^;
+  if Data[2].VBoolean = true then
+    s := ' active'
+  else
+    s := '';
+  result := Format
+    ('<li class="page-item%s"><a class=page-link href="%s?db=%d&num=%d">%s</a></li>',
+    [s, Request.ScriptName + PString(Self.Tag)^, FDTable1.FieldByName('dbnum')
+    .AsInteger, Data[0].VInteger, t]);
 end;
 
 function TWebModule1.hash(str: string): string;
@@ -786,8 +805,8 @@ begin
       FDTable1.Next;
     end;
     ReplaceText :=
-      '<div class="carousel-caption text-left" style="font-size:1.5rem">' +
-      ReplaceText + '</div>';
+      '<div class="carousel-caption text-left" style="text-align:bottom;font-size:1.5rem">'
+      + ReplaceText + '</div>';
   end
   else if TagString = 'info' then
     ReplaceText := FDTable1.Lookup('dbnum', FDTable3.FieldByName('info')
@@ -804,7 +823,7 @@ begin
       ReplaceText := ReplaceText +
         Format('<div class="carousel-item%s"><img src="%s/src?name=slide%d.jpg"',
         [s, Request.ScriptName, i]) +
-        ' style=float:right;height:465px><#list></div>';
+        ' class="d-sm-block d-none" style=float:right;height:465px><div style=height:465px></div><#list></div>';
       s := '';
     end;
   end