From 8d156610be187427d43f4d033b258f060f8968ad Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 9 Feb 2007 19:02:43 +0000 Subject: reorganize personal demo. --- .gitattributes | 5 + demos/personal/protected/Common/LoginPortlet.php | 19 +++ demos/personal/protected/Common/LoginPortlet.tpl | 44 +++++++ demos/personal/protected/Common/MainMenu.php | 12 ++ demos/personal/protected/Common/MainMenu.tpl | 15 +++ demos/personal/protected/Pages/Home.page | 22 +--- demos/personal/protected/Pages/Layout.php | 5 - demos/personal/protected/Pages/Layout.tpl | 66 ++++------ demos/personal/protected/Pages/Links.page | 116 +++++++++--------- demos/personal/protected/Pages/Register.page | 149 ++++++++++++++++------- demos/personal/protected/Pages/Register.php | 19 +++ demos/personal/protected/Pages/Resume.page | 126 +++++++++---------- demos/personal/protected/Pages/UserLogin.page | 19 +-- demos/personal/protected/application.xml | 12 +- demos/personal/themes/White/Default.css | 9 +- 15 files changed, 385 insertions(+), 253 deletions(-) create mode 100644 demos/personal/protected/Common/LoginPortlet.php create mode 100644 demos/personal/protected/Common/LoginPortlet.tpl create mode 100644 demos/personal/protected/Common/MainMenu.php create mode 100644 demos/personal/protected/Common/MainMenu.tpl create mode 100644 demos/personal/protected/Pages/Register.php diff --git a/.gitattributes b/.gitattributes index a30d9673..84300509 100644 --- a/.gitattributes +++ b/.gitattributes @@ -778,6 +778,10 @@ demos/helloworld/protected/pages/Home.page -text demos/helloworld/protected/pages/Home.php -text demos/personal/index.php -text demos/personal/protected/.htaccess -text +demos/personal/protected/Common/LoginPortlet.php -text +demos/personal/protected/Common/LoginPortlet.tpl -text +demos/personal/protected/Common/MainMenu.php -text +demos/personal/protected/Common/MainMenu.tpl -text demos/personal/protected/Pages/Albums.page -text demos/personal/protected/Pages/Home.page -text demos/personal/protected/Pages/Home.php -text @@ -785,6 +789,7 @@ demos/personal/protected/Pages/Layout.php -text demos/personal/protected/Pages/Layout.tpl -text demos/personal/protected/Pages/Links.page -text demos/personal/protected/Pages/Register.page -text +demos/personal/protected/Pages/Register.php -text demos/personal/protected/Pages/Resume.page -text demos/personal/protected/Pages/Settings.page -text demos/personal/protected/Pages/UserLogin.page -text diff --git a/demos/personal/protected/Common/LoginPortlet.php b/demos/personal/protected/Common/LoginPortlet.php new file mode 100644 index 00000000..1f5cd4f5 --- /dev/null +++ b/demos/personal/protected/Common/LoginPortlet.php @@ -0,0 +1,19 @@ +Application->getModule('auth'); + if(!$authManager->login($this->Username->Text,$this->Password->Text)) + $param->IsValid=false; + } + + public function loginButtonClicked($sender,$param) + { + if($this->Page->IsValid) + $this->Response->redirect($this->Application->getModule('auth')->getReturnUrl()); + } +} + +?> \ No newline at end of file diff --git a/demos/personal/protected/Common/LoginPortlet.tpl b/demos/personal/protected/Common/LoginPortlet.tpl new file mode 100644 index 00000000..82f9c045 --- /dev/null +++ b/demos/personal/protected/Common/LoginPortlet.tpl @@ -0,0 +1,44 @@ + +

Login to Site

+ + + + + + + + +
+ +
+ + + or + Create a new account + \ No newline at end of file diff --git a/demos/personal/protected/Common/MainMenu.php b/demos/personal/protected/Common/MainMenu.php new file mode 100644 index 00000000..a2334c03 --- /dev/null +++ b/demos/personal/protected/Common/MainMenu.php @@ -0,0 +1,12 @@ +Application->getModule('auth')->logout(); + $this->Response->redirect($this->Service->constructUrl('Home')); + } +} + +?> \ No newline at end of file diff --git a/demos/personal/protected/Common/MainMenu.tpl b/demos/personal/protected/Common/MainMenu.tpl new file mode 100644 index 00000000..7e3e59f1 --- /dev/null +++ b/demos/personal/protected/Common/MainMenu.tpl @@ -0,0 +1,15 @@ +HOME | +RESUME | +LINKS | +ALBUMS | +REGISTER | + + diff --git a/demos/personal/protected/Pages/Home.page b/demos/personal/protected/Pages/Home.page index 2c374229..2ae46032 100644 --- a/demos/personal/protected/Pages/Home.page +++ b/demos/personal/protected/Pages/Home.page @@ -1,27 +1,9 @@ - -
-
+

My Latest Piece of Work

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.

 diff --git a/demos/personal/protected/Pages/Layout.php b/demos/personal/protected/Pages/Layout.php index f5009542..ba96038b 100644 --- a/demos/personal/protected/Pages/Layout.php +++ b/demos/personal/protected/Pages/Layout.php @@ -2,11 +2,6 @@ class Layout extends TTemplateControl { - public function logout($sender,$param) - { - $this->Application->getModule('auth')->logout(); - $this->Response->redirect($this->Service->constructUrl('Home',null,false)); - } } ?> \ No newline at end of file diff --git a/demos/personal/protected/Pages/Layout.tpl b/demos/personal/protected/Pages/Layout.tpl index 8236be4c..3ffb5306 100644 --- a/demos/personal/protected/Pages/Layout.tpl +++ b/demos/personal/protected/Pages/Layout.tpl @@ -1,60 +1,44 @@ + +
-

Your Name Here

-

My Personal Site

-
- HOME | - RESUME | - LINKS | - ALBUMS | - REGISTER -
- -
- HOME | - Service->constructUrl('UserLogin') %> - Text="LOGIN" - Visible=<%= $this->User->IsGuest %> - /> - User->IsGuest %> - OnClick="logout" - /> -
+

Your Name Here

+

My Personal Site

+ +
+ +
+
- +
- -
- -
+ + + +
+ +
+
-
- HOME | - RESUME | - LINKS | - ALBUMS | - REGISTER -
- Copyright © 2006 Your Name here.
- Powered by PRADO. -
+
+ +
+Copyright © 2006-2007 Your Name here.
+Powered by PRADO. +
 - \ No newline at end of file diff --git a/demos/personal/protected/Pages/Links.page b/demos/personal/protected/Pages/Links.page index 2b2e85bc..05d19d3b 100644 --- a/demos/personal/protected/Pages/Links.page +++ b/demos/personal/protected/Pages/Links.page @@ -1,68 +1,68 @@ -

About the Links

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod - tincidunt ut laoreet dolore magna erat volutpat.

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod - tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis - nostrud exercitation consequat. esse molestie consequat, vel willum.

-

Top 5

-
-
Linked site name
+

About the Links

+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod +tincidunt ut laoreet dolore magna erat volutpat.

+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod +tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis +nostrud exercitation consequat. esse molestie consequat, vel willum.

+

Top 5

+
+
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
-

Cool Site Designs

-
-
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
+

Cool Site Designs

+
+
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
-

Photo Sites

-
-
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
+

Photo Sites

+
+
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
-

Resources

-
-
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
+

Resources

+
+
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
Linked site name
-
A description of the web site goes here.
-
Linked site name
-
A description of the web site goes here.
-
+
A description of the web site goes here.
+
Linked site name
+
A description of the web site goes here.
+
 \ No newline at end of file diff --git a/demos/personal/protected/Pages/Register.page b/demos/personal/protected/Pages/Register.page index 090d9e65..e8dd2d6f 100644 --- a/demos/personal/protected/Pages/Register.page +++ b/demos/personal/protected/Pages/Register.page @@ -5,46 +5,113 @@

Request an Account

-

Accounts will be activated pending the approval of the Administrator.

- - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - -
Sign Up for Your New Account
- - - - -
+ +

Accounts will be activated pending the approval of the Administrator.

+ + + +Username +
+ + + + + +
+ +Full name +
+ + +
+ +Password +
+ + + + +
+ +Re-type Password +
+ + + +
+ +Email Address +
+ + + + +
+ +Personal Website +
+ + +
+
+ + \ No newline at end of file diff --git a/demos/personal/protected/Pages/Register.php b/demos/personal/protected/Pages/Register.php new file mode 100644 index 00000000..b699d859 --- /dev/null +++ b/demos/personal/protected/Pages/Register.php @@ -0,0 +1,19 @@ +IsValid to false if the username is already taken + } + + public function createUser($sender,$param) + { + if($this->IsValid) + { + // create new user account + } + } +} + +?> \ No newline at end of file diff --git a/demos/personal/protected/Pages/Resume.page b/demos/personal/protected/Pages/Resume.page index 06ed845c..d34f105b 100644 --- a/demos/personal/protected/Pages/Resume.page +++ b/demos/personal/protected/Pages/Resume.page @@ -1,80 +1,80 @@ - - - - - - - - - +
Resume Photo
+ + + + + + + + - - - - - - - -
Resume Photo
+ + + + + + + +

Your Name Here

-

resume 1/23/04

-

555-555-1212 fax
- 555-555-1212 voice
- someone@example.com
- www.example.com
- City, State  Country

+

resume 1/23/04

+

555-555-1212 fax
+555-555-1212 voice
+someone@example.com
+www.example.com
+City, State  Country

-

download resume in word format

-

Objective

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit.

-

Experience

-

1999 - 2004  Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Sed diam nonummy nibh euismod

+

download resume in word format

+

Objective

+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit.

+

Experience

+

1999 - 2004  Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ Sed diam nonummy nibh euismod

-
    -
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • -
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • -
  • Duis autem veleum iriure dolor in hendrerit in vel willum.
    • -
-

1995 - 1999   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+

    +
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • +
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • +
  • Duis autem veleum iriure dolor in hendrerit in vel willum.
    • +
+

1995 - 1999   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Sed diam nonummy nibh euismod

-
    -
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • -
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • -
  • Duis autem veleum iriure dolor in hendrerit in vel willum.
    • -
-

1993 - 1995   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ Sed diam nonummy nibh euismod

+
    +
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • +
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • +
  • Duis autem veleum iriure dolor in hendrerit in vel willum.
    • +
+

1993 - 1995   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Sed diam nonummy nibh euismod

-
    -
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • -
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • -
  • Duis autem veleum iriure dolor in hendrerit in vel willum.
    • -
-

1987 - 1993   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ Sed diam nonummy nibh euismod

+
    +
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • +
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • +
  • Duis autem veleum iriure dolor in hendrerit in vel willum.
    • +
+

1987 - 1993   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Sed diam nonummy nibh euismod

-
    -
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • -
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • -
  • Duis autem veleum iriure dolor in hendrerit in vel willum.
    • -
-

Education

+ Sed diam nonummy nibh euismod

+
    +
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • +
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • +
  • Duis autem veleum iriure dolor in hendrerit in vel willum.
    • +
+

Education

-

1984 - 1987   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Sed diam nonummy nibh euismod

-
    -
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • -
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • -
+

1984 - 1987   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+Sed diam nonummy nibh euismod

+
    +
  • Ttincidunt ut laoreet dolore magna aliquam erat volutpat.
    • +
  • Ut wisi enim ad minim veniam, quis nostrud exercitation consequat.
    • +
-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit.

+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit.

 \ No newline at end of file diff --git a/demos/personal/protected/Pages/UserLogin.page b/demos/personal/protected/Pages/UserLogin.page index 8fb6019b..b87aa8fb 100644 --- a/demos/personal/protected/Pages/UserLogin.page +++ b/demos/personal/protected/Pages/UserLogin.page @@ -1,18 +1,5 @@ -Username: - - -
-Password:
- - - + + + \ No newline at end of file diff --git a/demos/personal/protected/application.xml b/demos/personal/protected/application.xml index 98ffa30a..d2affe24 100644 --- a/demos/personal/protected/application.xml +++ b/demos/personal/protected/application.xml @@ -1,6 +1,9 @@ + + + - - + + --> diff --git a/demos/personal/themes/White/Default.css b/demos/personal/themes/White/Default.css index 7c6880c0..d7072e7b 100644 --- a/demos/personal/themes/White/Default.css +++ b/demos/personal/themes/White/Default.css @@ -80,7 +80,7 @@ h2 { font-size: 11px; } -.menua { +.mainmenu { position: absolute; right: 37px; top: 17px; @@ -88,6 +88,10 @@ h2 { font-size: 10px; } +.mainmenu a:visited, .nav a:visited { + color: #d32525; +} + .nav { position: absolute; right: 37px; @@ -96,9 +100,6 @@ h2 { font-size: 10px; } -.menua a:visited, .nav a:visited { - color: #d32525; -} /* 1.1 SHIM */ -- cgit v1.2.3