Changeset 104 for trunk/Modules

Timestamp:

Oct 8, 2012, 10:22:08 AM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení hlavní stránky modulu Portál.

Location:

trunk/Modules

Files:

• Portal/UModulePortal.pas (modified) (4 diffs)
• Portal/UPagePortal.lfm (modified) (1 diff)
• Portal/UPagePortal.pas (modified) (10 diffs)
• ZdechovNET/UModuleZdechovNET.pas (modified) (2 diffs)

trunk/Modules/Portal/UModulePortal.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, UModularSystem, SpecializedDictionary, USqlDatabase,
-  UUtils, UWebSession, SpecializedList, UUser;
+  UUtils, UWebSession, SpecializedList, UUser, UWebPage, UHtmlClasses;
 
 type
@@ -18 +18 @@
     function ShowFooter(Session: TWebSession): string;
     function ShowHeader(Session: TWebSession): string;
+    procedure GeneratePage(ASession: TWebSession; Page: TWebPage);
   public
     constructor Create(Owner: TComponent); override;
@@ -54 +55 @@
 procedure TModulePortal.Start;
 begin
+  Core.GeneratePage := GeneratePage;
   Core.Pages.RegisterPage(TWebPagePortal, WebPagePortal, 'portal');
   inherited;
@@ -220 +222 @@
 end;
 
+procedure TModulePortal.GeneratePage(ASession: TWebSession; Page: TWebPage);
+var
+  I: Integer;
+  TitleTag: THtmlString;
+begin
+  with ASession do begin
+    HtmlDocument.ContentLanguage := 'cs';
+    GlobalTitle := 'Portál';
+    HtmlDocument.Styles.Add(NavigationLink('/Style/' + TCore(MainModule).Style + '/Style.css'));
+    HtmlDocument.Scripts.Add(NavigationLink('/Style/' + TCore(MainModule).Style + '/Global.js'));
+    HtmlDocument.Scripts.Add(NavigationLink('/Style/' + TCore(MainModule).Style + '/jquery.js'));
+
+      TitleTag := THtmlString.Create;
+      TitleTag.Text := ShowHeader(ASession);
+      HtmlDocument.Body.SubItems.Insert(0, TitleTag);
+      TitleTag := THtmlString.Create;
+      TitleTag.Text := ShowFooter(ASession);
+      HtmlDocument.Body.SubItems.Add(TitleTag);
+      //Page.Page.OnProduce(HandlerData);
+      HtmlDocument.Title := Page.Caption;
+      TitleTag.Text := '<div class="TitlePanel"><span class="GlobalTitle">' + GlobalTitle +
+        '</span> - ' + HtmlDocument.Title + '</div>';
+      HtmlDocument.Title := GlobalTitle + ' - ' + HtmlDocument.Title;
+      with HtmlDocument.AsXmlDocument do
+      try
+        Formated := TCore(MainModule).FormatHTML;
+        Response.Content.WriteString(AsString);
+      finally
+        Free;
+      end;
+    end;
+end;
+
 function TModulePortal.ShowFooter(Session: TWebSession): string;
 begin

trunk/Modules/Portal/UPagePortal.lfm

@@ -4 +4 @@
   OnProduce = DataModuleProduce
   Height = 142
-  HorizontalOffset = 313
-  VerticalOffset = 71
+  HorizontalOffset = 400
+  VerticalOffset = 193
   Width = 214
 end

trunk/Modules/Portal/UPagePortal.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UUtils,
-  SpecializedDictionary, UWebSession, SpecializedList;
+  SpecializedDictionary, UWebSession, SpecializedList, UHtmlClasses,
+  UModularSystem;
 
 type
@@ -20 +21 @@
     function SystemMessage(Title, Text: string): string;
     function ShowLinks(GroupId: Integer): string;
-    function Show: string;
+    procedure Show(HandlerData: THTTPHandlerData);
     function OnlineHostList: string;
     function UserPanel: string;
@@ -48 +49 @@
   Session := TWebSession(HandlerData);
   with TWebSession(HandlerData) do begin
-
+    Show(HandlerData);
+    GeneratePage(Self);
   end;
 end;
@@ -85 +87 @@
 end;
 
-function TWebPagePortal.Show: string;
+procedure TWebPagePortal.Show(HandlerData: THTTPHandlerData);
 var
   Output: string;
@@ -97 +99 @@
   I, J: Integer;
 begin
+  try
+    DbRows := TDbRows.Create;
+    DbRows2 := TDbRows.Create;
   Output := '';
   with Session.Request do
@@ -117 +122 @@
       TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Username').Value.Value,
         TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Password').Value.Value));
-      Output := Output + SystemMessage('Přihlášení', Result);
+      Output := Output + SystemMessage('Přihlášení', 'Přihlášení provedeno');
       if Session.User.Id <> UnknownUser then begin
         //Form.LoadValuesFromForm;
@@ -165 +170 @@
       Form.Load(Session.Request.Post);
       //Result = Session.User.PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
-      Output := Output + SystemMessage('Obnova hesla', Result);
+      Output := Output + SystemMessage('Obnova hesla', 'Heslo obnoveno');
       //if Result <> USER_PASSWORD_RECOVERY_SUCCESS then begin
         Output := Output + Form.AsXmlElement.AsString;
@@ -219 +224 @@
       end;
     end *);
+    end;
 
     //Session.Database.Database := Config['Database']['Database'];
@@ -235 +241 @@
       Session.Database.Query(DbRows2, 'SELECT * FROM `Panel` WHERE `PanelColumn`=' +
         PanelColumn.Values['Id'] + ' ORDER BY `Order`');
-      for J := 0 to DbRows2.Count - 1 do
-        Panel := DbRows[J];
+      for J := 0 to DbRows2.Count - 1 do begin
+        Panel := DbRows2[J];
         if Panel.Values['Module'] = 'HyperlinkGroup' then
           Output := Output + ShowLinks(StrToInt(Panel.Values['Parameters']))
@@ -253 +259 @@
       Output := Output + '</td>';
     end;
-    Output := Output + '</table>';
-    Result := Output;
+    Output := Output + '</tr></table>';
+    with TWebSession(HandlerData) do begin
+      with HtmlDocument.Body, THtmlString(SubItems.AddNew(THtmlString.Create)) do
+        Text := Text + Output;
+    end;
+  finally
+    DbRows2.Free;
+    DbRows.Free;
   end;
+end;
 
 function TWebPagePortal.OnlineHostList: string;

trunk/Modules/ZdechovNET/UModuleZdechovNET.pas

@@ -58 +58 @@
 begin
   with Core.Pages do begin
+    Core.GeneratePage := GeneratePage;
     RegisterPage(TInternetPage, InternetPage, 'internet');
     RegisterPage(THostingPage, HostingPage, 'hosting');
@@ -103 +104 @@
     DbRows := TDbRows.Create;
     Data := TDictionaryStringString.Create;
-
-    Core.GeneratePage := GeneratePage;
 
     Core.CommonDatabase.Query(DbRows,