Skip to content

Commit 5f7dad9

Browse files
committed
2.0.0
1 parent da81f2b commit 5f7dad9

18 files changed

+35
-460
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.DS_Store

about/theme.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313

1414
$theme_name = "Oh Canada";
15-
$theme_author = "Encore Web Studios";
16-
$theme_author_email = "formtools@encorewebstudios.com";
17-
$theme_link = "http://themes.formtools.org/ohcanada/";
15+
$theme_author = "Ben Keen";
16+
$theme_author_email = "ben.keen@gmail.com";
17+
$theme_link = "https://themes.formtools.org";
1818
$theme_description = "A red and white theme with a side-helping of maple syrup and moose.";
19-
$theme_version = "1.1.0";
19+
$theme_version = "2.0.0";

css/general.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ form { margin: 0px; }
7979
height:25px;
8080
padding-left: 12px;
8181
padding-right: 12px;
82-
color:white;
82+
color: white;
83+
padding-bottom: 4px;
8384
}
8485
#account_section a:link, #account_section a:visited {
8586
color: #f2f2f2;

dhtml_pagination.tpl

Lines changed: 0 additions & 54 deletions
This file was deleted.

error.tpl

Lines changed: 0 additions & 97 deletions
This file was deleted.

footer.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</div>
88

99
{* only display the footer area if there is some text entered for it *}
10-
{if $account.settings.footer_text != "" || $g_enable_benchmarking}
10+
{if $footer_text != "" || $g_enable_benchmarking}
1111
<div class="footer">
12-
{$account.settings.footer_text}
12+
{$footer_text|default:""}
1313
{show_page_load_time}
1414
</div>
1515
{/if}
1616

1717
</body>
18-
</html>
18+
</html>

forget_password.tpl

Lines changed: 0 additions & 38 deletions
This file was deleted.

header.tpl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!DOCTYPE html>
22
<html dir="{$LANG.special_text_direction}">
33
<head>
44
<title>{$head_title}</title>
@@ -35,7 +35,7 @@
3535
<div id="container">
3636
3737
<div id="header">
38-
{if $SESSION.account.is_logged_in && !$g_omit_top_bar}
38+
{if $is_logged_in}
3939
<div style="position:absolute; top: 0px; right: 0px;">
4040
<table cellspacing="0" cellpadding="0" height="25">
4141
<tr>
@@ -48,7 +48,7 @@
4848
{else}
4949
<b>{$settings.program_version}</b>
5050
{/if}
51-
{if $SESSION.account.account_type == "admin"}
51+
{if $account.account_type == "admin"}
5252
|
5353
<a href="#" onclick="return ft.check_updates()" class="update_link">{$LANG.word_update}</a>
5454
{/if}
@@ -59,11 +59,13 @@
5959
</div>
6060
{/if}
6161
62-
<span style="float: left">
63-
{if $settings.logo_link}<a href="{$settings.logo_link}">{/if}<img src="{$theme_url}/images/logo.jpg" border="0" width="791" height="87" />{if $settings.logo_link}</a>{/if}
62+
<span style="float: left; height: 87px">
63+
{if isset($settings.logo_link) && !empty($settings.logo_link)}<a href="{$settings.logo_link}">{/if}
64+
<img src="{$theme_url}/images/logo.jpg" border="0" width="791" height="87" />
65+
{if isset($settings.logo_link) && !empty($settings.logo_link)}</a>{/if}
6466
</span>
6567
66-
<div class="clear"> </div>
68+
<div class="clear"> </div>
6769
</div>
6870
6971
<div id="content">

images/favicon.ico

-2.43 KB
Binary file not shown.

index.tpl

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)