Permalink
Browse files

Merged default and index layouts into one, which should help eliminat…

…e confusion over switching themes and the index having a custom layout specified, making it look like the theme was not applied.
  • Loading branch information...
1 parent b51bdae commit 03473f5f22820393b7b6e59551da377d1e12816a @jbroadway committed May 20, 2012
Showing with 16 additions and 55 deletions.
  1. +1 −1 conf/install_mysql.sql
  2. +1 −1 conf/install_pgsql.sql
  3. +1 −1 conf/install_sqlite.sql
  4. +13 −1 layouts/default.html
  5. +0 −51 layouts/index.html
View
@@ -13,7 +13,7 @@ create table webpage (
index (access)
) default charset=utf8;
-insert into webpage (id, title, menu_title, window_title, access, layout, description, keywords, body) values ('index', 'Welcome to Elefant', 'Home', '', 'public', 'index', '', '', '<table><tbody><tr><td><h3>Congratulations!</h3>You have successfully installed Elefant, the refreshingly simple new PHP web framework and CMS.</td><td><h3>Getting Started</h3>To log in as an administrator and edit pages, write a blog post, or upload files, go to <a href="/admin">/admin</a>.</td><td><h3>Developers</h3>Documentation, source code and issue tracking can be found at <a href="http://github.com/jbroadway/elefant">github.com/jbroadway/elefant</a></td></tr></tbody></table>');
+insert into webpage (id, title, menu_title, window_title, access, layout, description, keywords, body) values ('index', 'Welcome to Elefant', 'Home', '', 'public', 'default', '', '', '<table><tbody><tr><td><h3>Congratulations!</h3>You have successfully installed Elefant, the refreshingly simple new PHP web framework and CMS.</td><td><h3>Getting Started</h3>To log in as an administrator and edit pages, write a blog post, or upload files, go to <a href="/admin">/admin</a>.</td><td><h3>Developers</h3>Documentation, source code and issue tracking can be found at <a href="http://github.com/jbroadway/elefant">github.com/jbroadway/elefant</a></td></tr></tbody></table>');
create table block (
id char(72) not null primary key,
View
@@ -15,7 +15,7 @@ create table webpage (
create index webpage_access on webpage (access);
-insert into webpage (id, title, menu_title, window_title, access, layout, description, keywords, body) values ('index', 'Welcome to Elefant', 'Home', '', 'public', 'index', '', '', '<table><tbody><tr><td><h3>Congratulations!</h3>You have successfully installed Elefant, the refreshingly simple new PHP web framework and CMS.</td><td><h3>Getting Started</h3>To log in as an administrator and edit pages, write a blog post, or upload files, go to <a href="/admin">/admin</a>.</td><td><h3>Developers</h3>Documentation, source code and issue tracking can be found at <a href="http://github.com/jbroadway/elefant">github.com/jbroadway/elefant</a></td></tr></tbody></table>');
+insert into webpage (id, title, menu_title, window_title, access, layout, description, keywords, body) values ('index', 'Welcome to Elefant', 'Home', '', 'public', 'default', '', '', '<table><tbody><tr><td><h3>Congratulations!</h3>You have successfully installed Elefant, the refreshingly simple new PHP web framework and CMS.</td><td><h3>Getting Started</h3>To log in as an administrator and edit pages, write a blog post, or upload files, go to <a href="/admin">/admin</a>.</td><td><h3>Developers</h3>Documentation, source code and issue tracking can be found at <a href="http://github.com/jbroadway/elefant">github.com/jbroadway/elefant</a></td></tr></tbody></table>');
create table block (
View
@@ -14,7 +14,7 @@ create table webpage (
create index webpage_access on webpage (access);
-insert into webpage (id, title, menu_title, window_title, access, layout, description, keywords, body) values ('index', 'Welcome to Elefant', 'Home', '', 'public', 'index', '', '', '<table><tbody><tr><td><h3>Congratulations!</h3>You have successfully installed Elefant, the refreshingly simple new PHP web framework and CMS.</td><td><h3>Getting Started</h3>To log in as an administrator and edit pages, write a blog post, or upload files, go to <a href="/admin">/admin</a>.</td><td><h3>Developers</h3>Documentation, source code and issue tracking can be found at <a href="http://github.com/jbroadway/elefant">github.com/jbroadway/elefant</a></td></tr></tbody></table>');
+insert into webpage (id, title, menu_title, window_title, access, layout, description, keywords, body) values ('index', 'Welcome to Elefant', 'Home', '', 'public', 'default', '', '', '<table><tbody><tr><td><h3>Congratulations!</h3>You have successfully installed Elefant, the refreshingly simple new PHP web framework and CMS.</td><td><h3>Getting Started</h3>To log in as an administrator and edit pages, write a blog post, or upload files, go to <a href="/admin">/admin</a>.</td><td><h3>Developers</h3>Documentation, source code and issue tracking can be found at <a href="http://github.com/jbroadway/elefant">github.com/jbroadway/elefant</a></td></tr></tbody></table>');
create table block (
id char(72) not null primary key,
View
@@ -26,6 +26,16 @@ <h1>{{ conf('General', 'site_name') }}</h1>
</div>
</div>
<div class="clear"></div>
+{% if id === 'index' %}
+ <div id="body" class="grid_12 index-body">
+
+{! filemanager/slideshow?path=homepage !}
+
+{% if title != '' %}<h2>{{ title|none }}</h2>{% end %}
+{{ body|none }}
+
+ </div>
+{% else %}
<div id="body" class="grid_8">
{% if title != '' %}<h2>{{ title|none }}</h2>{% end %}
@@ -35,13 +45,15 @@ <h1>{{ conf('General', 'site_name') }}</h1>
<div id="sidebar" class="grid_4">
{! blocks/members !}
</div>
+{% end %}
<div class="clear"></div>
<div id="footer" class="grid_12">
<div class="grid_6 alpha menu">
{! navigation/top !}
</div>
<div class="grid_6 omega powered">
- {"Powered by"} <a href="http://www.elefantcms.com/">Elefant CMS</a>
+ {"Powered by"} <a href="http://www.elefantcms.com/">Elefant CMS</a><br />
+ {"Photos by"} <a href="http://www.rachaelhosein.com/">Rachael Hosein</a>
</div>
</div>
<div class="clear"></div>
View
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>{{ conf('General', 'site_name') }} - {{ window_title|none }}</title>
- <meta charset="{{ i18n.charset }}" />
- {% if detect('mobile') %}
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
- <link rel="stylesheet" type="text/css" href="/css/mobile.css" />
- {% else %}
- <link rel="stylesheet" type="text/css" href="/css/reset.css" />
- <link rel="stylesheet" type="text/css" href="/css/text.css" />
- <link rel="stylesheet" type="text/css" href="/css/960.css" />
- <link rel="stylesheet" type="text/css" href="/css/style.css" />
- {% end %}
- {! admin/head !}
- {{ head|none }}
-</head>
-<body>
-<div id="wrapper" class="container_12">
- <div id="head" class="grid_12">
- <div class="grid_6 alpha">
- <h1>{{ conf('General', 'site_name') }}</h1>
- </div>
- <div class="grid_6 omega menu">
- {! navigation/top !}
- </div>
- </div>
- <div class="clear"></div>
- <div id="body" class="grid_12 index-body">
-
-{! filemanager/slideshow?path=homepage !}
-
-{% if title != '' %}<h2>{{ title|none }}</h2>{% end %}
-{{ body|none }}
-
- </div>
- <div class="clear"></div>
- <div id="footer" class="grid_12">
- <div class="grid_6 alpha menu">
- {! navigation/top !}
- </div>
- <div class="grid_6 omega powered">
- {"Powered by"} <a href="http://www.elefantcms.com/">Elefant CMS</a><br />
- {"Photos by"} <a href="http://www.rachaelhosein.com/">Rachael Hosein</a>
- </div>
- </div>
- <div class="clear"></div>
-</div>
-{{ tail|none }}
-</body>
-</html>

0 comments on commit 03473f5

Please sign in to comment.