added logo and support for changing it

pejg12 · Dec 25, 2012 · e46b4c1 · e46b4c1
1 parent fc2d91b
commit e46b4c1
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 2 deletions.
diff --git a/site/config.php b/site/config.php
@@ -116,6 +116,10 @@
     'site_title' => 'Another MVC',
     'slogan'     => 'A PHP-based MVC-inspired CMF',
     'footer'     => '<p>Another MVC &copy; pejg12 (pejg12@student.bth.se) <br /> Fork of Lydia &copy; Mikael Roos (mos@dbwebb.se)</p>',
+    'favicon'    => 'logo_60x72.png',
+    'logo'       => 'logo_60x72.png',
+    'logo_width' => 60,
+    'logo_height'=> 72,
   ),
 );
 

diff --git a/themes/functions.php b/themes/functions.php
@@ -54,7 +54,7 @@ function get_debug() {
 /**
  * Prepend the base_url.
  */
-function base_url($url) {
+function base_url($url=null) {
   return $amvc->request->base_url . trim($url, '/');
 }
 

diff --git a/themes/grid/default.tpl.php b/themes/grid/default.tpl.php
@@ -12,10 +12,11 @@
 
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
+    <link rel='shortcut icon' href='<?=theme_url($favicon)?>'/>
     <link rel="stylesheet" href="<?=theme_parent_url('css/normalize.css')?>">
     <link rel="stylesheet" href="<?=theme_parent_url('css/main.css')?>">
     <link rel="stylesheet" href="<?=theme_url($stylesheet)?>">
-    <script src="<?=$themeUrl?>/js/vendor/modernizr-2.6.2.min.js"></script>
+    <script src="<?=theme_parent_url('js/vendor/modernizr-2.6.2.min.js')?>"></script>
 
 <?php if(isset($inline_style)): ?>
     <style>
@@ -41,6 +42,7 @@
     </header>
 
     <header>
+      <a href='<?=base_url()?>'><img src='<?=theme_url($logo)?>' alt='Logo' width='<?=$logo_width?>' height='<?=$logo_height?>' /></a>
       <h1><?=$site_title?></h1>
       <p><?=$slogan?></p>
     </header>

diff --git a/themes/grid/logo_60x72.png b/themes/grid/logo_60x72.png
diff --git a/themes/grid/style.css b/themes/grid/style.css
@@ -31,6 +31,13 @@ body>header {
 body>header:nth-child(2) {
   margin-top: 24px;
 }
+body>header:nth-child(2) img {
+  float: left;
+  margin-right: 20px;
+}
+body>header:nth-child(2) h1 {
+  margin-top: 0;
+}
 body>header#top {
   position: absolute;
   top: 0;

diff --git a/themes/grid/style.less b/themes/grid/style.less
@@ -44,6 +44,13 @@ body>header {
   clear: both;
   &:nth-child(2) {
     margin-top: @grid-height;
+    img {
+      float: left;
+      margin-right: (@gutter-width * 1px);
+    }
+    h1 {
+      margin-top: 0;
+    }
   }
   margin-bottom: @grid-height;
   &#top {

diff --git a/themes/grid/verbose.tpl.php b/themes/grid/verbose.tpl.php
@@ -43,6 +43,7 @@
     </header>
 
     <header>
+      <a href='<?=base_url()?>'><img src='<?=theme_url($logo)?>' alt='Logo' width='<?=$logo_width?>' height='<?=$logo_height?>' /></a>
       <h1><?=$site_title?></h1>
       <p><?=$slogan?></p>
     </header>