Skip to content

Commit 4916c64

Browse files
benkeenbenkeen
committed
2.0.2
1 parent 8a1e620 commit 4916c64

11 files changed

+60
-295
lines changed

‎about/theme.php

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
<?php
22

3-
/**
4-
* Form Tools Theme File
5-
* ---------------------
6-
*/
7-
83
$theme_name = "Classic Grey";
94
$theme_author = "Ben Keen";
105
$theme_author_email = "[email protected]";
116
$theme_link = "https://themes.formtools.org";
127
$theme_description = "A remodelling of the old grey-styled Form Tools 1.x theme.";
13-
$theme_version = "2.0.1";
8+
$theme_version = "2.0.2";
149
$theme_uses_swatches = "no";

‎footer.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</div>
1616

1717
{* only display the footer area if there is some text entered for it *}
18-
{if $account.settings.footer_text != "" || $g_enable_benchmarking}
18+
{if $footer_text != "" || $g_enable_benchmarking}
1919
<div id="footer">
20-
{$footer_text}
20+
{$footer_text|default:""}
2121
{show_page_load_time}
2222
</div>
2323
{/if}

‎forget_password.tpl

-38
This file was deleted.

‎header.tpl

+2-2
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>
@@ -34,7 +34,7 @@
3434
<div id="header">{if $settings.logo_link}<a href="{$settings.logo_link}">{/if}<img src="{$theme_url}/images/header_logo.jpg" width="392" height="60" border="0" />{if $settings.logo_link}</a>{/if}</div>
3535
<div id="header_row">
3636
<div id="left_nav_top">
37-
{if $is_logged_in && !$g_omit_top_bar}
37+
{if $is_logged_in}
3838
{if $settings.release_type == "alpha"}
3939
<b>{$settings.program_version}-alpha-{$settings.release_date}</b>
4040
{elseif $settings.release_type == "beta"}

‎index.tpl

-59
This file was deleted.

‎menu.tpl

-34
This file was deleted.

‎messages.tpl

-50
This file was deleted.

‎module_menu.tpl

-16
This file was deleted.

‎modules_header.tpl

+55-52
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,65 @@
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>
4-
<title>{$head_title}</title>
5-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6-
<link rel="shortcut icon" href="{$theme_url}/images/favicon.ico" >
7-
{template_hook location="modules_head_top"}
8-
<script>
9-
//<![CDATA[
10-
var g = {literal}{{/literal}
11-
root_url: "{$g_root_url}",
12-
error_colours: ["ffbfbf", "ffeded"],
13-
notify_colours: ["c6e2ff", "f2f8ff"],
14-
js_debug: {$g_js_debug}
15-
{literal}}{/literal};
16-
//]]>
17-
</script>
18-
<link type="text/css" rel="stylesheet" href="{$g_root_url}/global/css/main.css?v=2_1_0">
19-
<link type="text/css" rel="stylesheet" href="{$theme_url}/css/styles.css?v=2_1_0">
20-
<link href="{$theme_url}/css/smoothness/jquery-ui-1.8.14.custom.css" rel="stylesheet" type="text/css"/>
21-
<script src="{$g_root_url}/global/scripts/jquery.js"></script>
22-
<script src="{$theme_url}/scripts/jquery-ui-1.8.14.custom.min.js"></script>
23-
<script src="{$g_root_url}/global/scripts/general.js?v=2_1_0"></script>
24-
<script src="{$g_root_url}/global/scripts/rsv.js?v=2_1_0"></script>
25-
{$head_string}
26-
{$head_js}
27-
{$head_css}
28-
{template_hook location="modules_head_top"}
4+
<title>{$head_title}</title>
5+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6+
<link rel="shortcut icon" href="{$theme_url}/images/favicon.ico" >
7+
{template_hook location="modules_head_top"}
8+
<script>
9+
//<![CDATA[
10+
var g = {literal}{{/literal}
11+
root_url: "{$g_root_url}",
12+
error_colours: ["ffbfbf", "ffeded"],
13+
notify_colours: ["c6e2ff", "f2f8ff"],
14+
js_debug: {$g_js_debug}
15+
{literal}}{/literal};
16+
//]]>
17+
</script>
18+
<link type="text/css" rel="stylesheet" href="{$g_root_url}/global/css/main.css?v=2_1_0">
19+
<link type="text/css" rel="stylesheet" href="{$theme_url}/css/styles.css?v=2_1_0">
20+
<link href="{$theme_url}/css/smoothness/jquery-ui-1.8.14.custom.css" rel="stylesheet" type="text/css"/>
21+
<script src="{$g_root_url}/global/scripts/jquery.js"></script>
22+
<script src="{$theme_url}/scripts/jquery-ui-1.8.14.custom.min.js"></script>
23+
<script src="{$g_root_url}/global/scripts/general.js?v=2_1_0"></script>
24+
<script src="{$g_root_url}/global/scripts/rsv.js?v=2_1_0"></script>
25+
{css_files files=$css_files module_folder=$module_folder root_url=$g_root_url}
26+
{js_files files=$js_files module_folder=$module_folder root_url=$g_root_url}
27+
28+
{$head_string}
29+
{$head_js}
30+
{$head_css}
31+
{template_hook location="modules_head_top"}
2932
</head>
3033
<body class="module_pages">
3134
3235
<div id="container">
33-
<div id="header">{if $settings.logo_link}<a href="{$settings.logo_link}">{/if}<img src="{$theme_url}/images/header_logo.jpg" width="392" height="60" border="0" />{if $settings.logo_link}</a>{/if}</div>
34-
<div id="header_row">
35-
<div id="left_nav_top">
36-
{if $SESSION.account.is_logged_in && !$g_omit_top_bar}
37-
{if $settings.release_type == "alpha"}
38-
<b>{$settings.program_version}-alpha-{$settings.release_date}</b>
39-
{elseif $settings.release_type == "beta"}
40-
<b>{$settings.program_version}-beta-{$settings.release_date}</b>
41-
{else}
42-
<b>{$settings.program_version}</b>
43-
{/if}
44-
{if $SESSION.account.account_type == "admin"}
45-
&nbsp;
46-
<a href="#" onclick="return ft.check_updates()" class="update_link">{$LANG.word_update}</a>
47-
{/if}
48-
{else}
49-
<div style="height: 20px"> </div>
50-
{/if}
36+
<div id="header">{if $settings.logo_link}<a href="{$settings.logo_link}">{/if}<img src="{$theme_url}/images/header_logo.jpg" width="392" height="60" border="0" />{if $settings.logo_link}</a>{/if}</div>
37+
<div id="header_row">
38+
<div id="left_nav_top">
39+
{if $account.is_logged_in}
40+
{if $settings.release_type == "alpha"}
41+
<b>{$settings.program_version}-alpha-{$settings.release_date}</b>
42+
{elseif $settings.release_type == "beta"}
43+
<b>{$settings.program_version}-beta-{$settings.release_date}</b>
44+
{else}
45+
<b>{$settings.program_version}</b>
46+
{/if}
47+
{if $account.account_type == "admin"}
48+
&nbsp;
49+
<a href="#" onclick="return ft.check_updates()" class="update_link">{$LANG.word_update}</a>
50+
{/if}
51+
{else}
52+
<div style="height: 20px"> </div>
53+
{/if}
54+
</div>
5155
</div>
52-
</div>
5356
54-
<div class="outer">
55-
<div class="inner">
56-
<div class="float-wrap">
57-
<div id="content">
57+
<div class="outer">
58+
<div class="inner">
59+
<div class="float-wrap">
60+
<div id="content">
5861
59-
<div class="content_wrap">
62+
<div class="content_wrap">
6063
61-
<div id="main_window">
62-
<div id="page_content">
64+
<div id="main_window">
65+
<div id="page_content">

‎tabset_close.tpl

-1
This file was deleted.

0 commit comments

Comments
 (0)