From 90b8ea7c1822225291dbe4042f918d8b4a5a039c Mon Sep 17 00:00:00 2001 From: Artem Daniliants Date: Wed, 31 Mar 2010 14:40:40 +0300 Subject: [PATCH] Template integrated --- Server/application/config/routes.php | 2 +- Server/application/controllers/page.php | 17 -- Server/application/controllers/pages.php | 19 +++ Server/application/views/pages/base.php | 162 +++----------------- .../application/views/pages/tracking_analytics.php | 15 ++ Server/static/css/style.css | 2 +- 6 files changed, 56 insertions(+), 161 deletions(-) delete mode 100644 Server/application/controllers/page.php create mode 100644 Server/application/controllers/pages.php create mode 100644 Server/application/views/pages/tracking_analytics.php diff --git a/Server/application/config/routes.php b/Server/application/config/routes.php index 0121b60..983ddaa 100644 --- a/Server/application/config/routes.php +++ b/Server/application/config/routes.php @@ -4,4 +4,4 @@ * * Sets the default route to "welcome" */ -$config['_default'] = 'api'; +$config['_default'] = 'pages'; diff --git a/Server/application/controllers/page.php b/Server/application/controllers/page.php deleted file mode 100644 index d47ca8d..0000000 --- a/Server/application/controllers/page.php +++ /dev/null @@ -1,17 +0,0 @@ -template->content= 'to be replaced'; - } -} \ No newline at end of file diff --git a/Server/application/controllers/pages.php b/Server/application/controllers/pages.php new file mode 100644 index 0000000..00e6507 --- /dev/null +++ b/Server/application/controllers/pages.php @@ -0,0 +1,19 @@ +template->title = 'Maemo application for car enthusiasts'; + $this->template->header = 'Home'; + $this->template->content = 'HOMEZ'; + } +} \ No newline at end of file diff --git a/Server/application/views/pages/base.php b/Server/application/views/pages/base.php index bf5aa16..6c44a1b 100644 --- a/Server/application/views/pages/base.php +++ b/Server/application/views/pages/base.php @@ -1,7 +1,7 @@ - +<?php echo $title; ?> - SpeedFreak @@ -10,45 +10,31 @@ - - - +render(); ?> - +
- + - +
@@ -58,36 +44,11 @@
-
+
-

Our locations

- United States of America - Fusce euismod consequat ante. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque sed dolor. Aliquam congue fermentum nisl. Mauris accumsan nulla vel diam. -

- Netherlands - Sed in lacus ut enim adipiscing aliquet. Nulla venenatis. In pede mi, aliquet sit amet, euism in, auctor ut, ligula. Aliquam dapibus tincidunt metus. Praesent justo dolor, lobortis quis, lobortis dignissim, pulvinar ac, lorem. Vestibulum sed ante. -

-

- New Zealand - Maecenas tristique orci ac sem. Duis ultricies pharetra magna. Donec accumsan malesuada
orci. Donec sit amet eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. -

-
-
-

Useful links

- -

More Info

+

+
@@ -99,99 +60,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Postal address
-
-
-
-
- Pellentesque sed dolor. Aliquam congue fermentum nisl. Mauris accumsan nulla vel diam. Sed in lacus ut enim adipiscing aliquet. Nulla venenatis. -
-

- The Company Name Inc.
- 8901 Marmora Road,
- Glasgow, D04 89GR. -

-

- +1 800 559 6580Freephone:
- +1 959 603 6035Telephone:
- +1 504 889 9898FAX:
- E-mail: mail@companyname.com -

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Contact form
-
-
-
-
-
-
- - - - -
-
- Send - Clear -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +
+ - +
+render(); ?> diff --git a/Server/application/views/pages/tracking_analytics.php b/Server/application/views/pages/tracking_analytics.php new file mode 100644 index 0000000..1973376 --- /dev/null +++ b/Server/application/views/pages/tracking_analytics.php @@ -0,0 +1,15 @@ + + + diff --git a/Server/static/css/style.css b/Server/static/css/style.css index cfd93e5..9f798b7 100644 --- a/Server/static/css/style.css +++ b/Server/static/css/style.css @@ -20,7 +20,7 @@ a {color:#21b3c6; outline:none;} a:hover{text-decoration:none;} p {padding-top:20px;} h2{ font-size:3.846em; text-transform:uppercase; line-height:1.2em; padding-bottom:2px;} -h3{ font-size:2.308em; background:url(../static/img/title-bg.gif) no-repeat 0 2px; color:#fff; line-height:1.2em; padding:0 0 3px 44px;} +h3{ font-size:2.308em; background:url(../static/img/title-bg.gif) no-repeat 0 2px; color:#fff; line-height:1.2em; padding-bottom:5px;} h4{ font-size:1.538em; line-height:1.2em; padding-bottom:12px;} h5{ font-size:1.538em; line-height:1.2em; padding:7px 0 0 13px;} strong{ color:#21b3c6; display:block; padding-bottom:3px;} -- 1.7.9.5