2.0.0

formtools · Nov 11, 2017 · 5f7dad9 · 5f7dad9
1 parent da81f2b
commit 5f7dad9
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 460 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/about/theme.php b/about/theme.php
@@ -12,8 +12,8 @@
  */
 
 $theme_name = "Oh Canada";
-$theme_author = "Encore Web Studios";
-$theme_author_email = "formtools@encorewebstudios.com";
-$theme_link = "http://themes.formtools.org/ohcanada/";
+$theme_author = "Ben Keen";
+$theme_author_email = "ben.keen@gmail.com";
+$theme_link = "https://themes.formtools.org";
 $theme_description = "A red and white theme with a side-helping of maple syrup and moose.";
-$theme_version = "1.1.0";
+$theme_version = "2.0.0";
diff --git a/css/general.css b/css/general.css
@@ -79,7 +79,8 @@ form { margin: 0px; }
   height:25px;
   padding-left: 12px;
   padding-right: 12px;
-  color:white;
+  color: white;
+  padding-bottom: 4px;
 }
 #account_section a:link, #account_section a:visited {
   color: #f2f2f2;

diff --git a/dhtml_pagination.tpl b/dhtml_pagination.tpl
diff --git a/error.tpl b/error.tpl
diff --git a/footer.tpl b/footer.tpl
@@ -7,12 +7,12 @@
 </div>
 
 {* only display the footer area if there is some text entered for it *}
-{if $account.settings.footer_text != "" || $g_enable_benchmarking}
+{if $footer_text != "" || $g_enable_benchmarking}
   <div class="footer">
-    {$account.settings.footer_text}
+    {$footer_text|default:""}
     {show_page_load_time}
   </div>
 {/if}
 
 </body>
-</html>
+</html>
diff --git a/forget_password.tpl b/forget_password.tpl
diff --git a/header.tpl b/header.tpl
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html dir="{$LANG.special_text_direction}">
 <head>
   <title>{$head_title}</title>
@@ -35,7 +35,7 @@
 <div id="container">
 
   <div id="header">
-    {if $SESSION.account.is_logged_in && !$g_omit_top_bar}
+    {if $is_logged_in}
       <div style="position:absolute; top: 0px; right: 0px;">
         <table cellspacing="0" cellpadding="0" height="25">
         <tr>
@@ -48,7 +48,7 @@
             {else}
               <b>{$settings.program_version}</b>
             {/if}
-            {if $SESSION.account.account_type == "admin"}
+            {if $account.account_type == "admin"}
               |
               <a href="#" onclick="return ft.check_updates()" class="update_link">{$LANG.word_update}</a>
             {/if}
@@ -59,11 +59,13 @@
       </div>
     {/if}
 
-    <span style="float: left">
-    {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}
+    <span style="float: left; height: 87px">
+    {if isset($settings.logo_link) && !empty($settings.logo_link)}<a href="{$settings.logo_link}">{/if}
+      <img src="{$theme_url}/images/logo.jpg" border="0" width="791" height="87" />
+    {if isset($settings.logo_link) && !empty($settings.logo_link)}</a>{/if}
     </span>
 
-		<div class="clear"> </div>
+    <div class="clear"> </div>
   </div>
 
   <div id="content">

diff --git a/images/favicon.ico b/images/favicon.ico
diff --git a/index.tpl b/index.tpl
diff --git a/menu.tpl b/menu.tpl