Merge pull request #71 from creecros/creecros-patch-1

Creecros patch 1

Author: creecros

Plugin.php

@@ -11,7 +11,7 @@ class Plugin extends Base
 
     public function initialize()
     {
-	global $customizer;
+	global $customizer; 
 
 	// Themes
 	$customizer['themes'] = array(
@@ -91,6 +91,16 @@ public function initialize()
 	//Permissions for login page to access logos    
         $this->applicationAccessMap->add('CustomizerFileController', array('image', 'loginlogo', 'logo', 'link', 'logoexists', 'linkexists'), Role::APP_PUBLIC);
 
+	//Get accurate version
+        $wasmaster = APP_VERSION;
+        
+        if (strpos(APP_VERSION, 'master') !== false && file_exists('ChangeLog')) { $wasmaster = trim(file_get_contents('ChangeLog', false, null, 8, 6), ' '); }
+        if (version_compare($wasmaster, '1.2.4') >= 0) {
+        	$this->template->setTemplateOverride('header/title', 'customizer:header/title');
+	} else {
+        	$this->template->setTemplateOverride('header/title', 'customizer:header/title_older_kb');
+	}
+	    
     }
 
     public function onStartup()
@@ -123,7 +133,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.8.1';
+        return '1.8.2';
     }
 
     public function getPluginHomepage()

Template/header/title.php

@@ -18,9 +18,7 @@
             <?= $this->text->e($title) ?>
         <?php endif ?>
     </span>
-<?php if (version_compare(APP_VERSION, '1.1.0') >= 0) : ?>
     <?php if (! empty($description)): ?>
         <?= $this->app->tooltipHTML($description) ?>
     <?php endif ?>
- <?php endif ?>
 </h1>

Template/header/title_older_kb.php

@@ -0,0 +1,26 @@
+<h1>
+    <?php if (null !== $this->task->customizerFileModel->getByType(1)) : ?>
+    <span class="logo">
+      <a href="<?= $this->url->href('DashboardController', 'show', array(), false, '', t('Dashboard')) ?>">
+        <img src="<?= $this->url->href('CustomizerFileController', 'image', array('plugin' => 'customizer', 'file_id' => $this->task->customizerFileModel->getIdByType(1))) ?>" height="<?= $this->task->configModel->get('headerlogo_size', '30') ?>">
+      </a>
+    </span>
+    <?php else: ?>
+    <span class="logo">
+        <?= $this->url->link('K<span>B</span>', 'DashboardController', 'show', array(), false, '', t('Dashboard')) ?>
+    </span>    
+    <?php endif ?>
+
+    <span class="title">
+        <?php if (! empty($project) && ! empty($task)): ?>
+            <?= $this->url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?>
+        <?php else: ?>
+            <?= $this->text->e($title) ?>
+        <?php endif ?>
+    </span>
+    <?php if (! empty($description)): ?>
+        <small class="tooltip" title="<?= $this->text->markdownAttribute($description) ?>">
+            <i class="fa fa-info-circle"></i>
+        </small>
+    <?php endif ?>
+</h1>