From 19daa2b0b7e368d82bc6ab79e2ed872143fd90d0 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 20 Dec 2018 10:43:44 +0800
Subject: [PATCH 1/3]  * adjust for message setting.

---
 xuanxuan/module/message/ext/config/xuanxuan.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xuanxuan/module/message/ext/config/xuanxuan.php b/xuanxuan/module/message/ext/config/xuanxuan.php
index ba81cc8e28..250bbf0518 100644
--- a/xuanxuan/module/message/ext/config/xuanxuan.php
+++ b/xuanxuan/module/message/ext/config/xuanxuan.php
@@ -1,3 +1,6 @@
 <?php
-$config->message->available['xuanxuan'] = $config->message->objectTypes;
+$config->message->available['xuanxuan']['story'] = array('opened', 'edited', 'commented', 'frombug', 'changed', 'reviewed', 'closed', 'activated');
+$config->message->available['xuanxuan']['task']  = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'started', 'finished', 'paused', 'canceled', 'restarted', 'closed', 'activated');
+$config->message->available['xuanxuan']['bug']   = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'bugconfirmed', 'resolved', 'closed', 'activated');
+$config->message->available['xuanxuan']['todo']  = array('opened', 'edited');
 $config->message->setting['xuanxuan']['setting'] = $config->message->available['xuanxuan'];

From e35503d49345b1ac5eabc34dc849c2dd2f06edfe Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 20 Dec 2018 11:01:27 +0800
Subject: [PATCH 2/3]  * adjust message setting for xuanxuan

---
 xuanxuan/module/message/ext/config/xuanxuan.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xuanxuan/module/message/ext/config/xuanxuan.php b/xuanxuan/module/message/ext/config/xuanxuan.php
index 250bbf0518..2c118573b6 100644
--- a/xuanxuan/module/message/ext/config/xuanxuan.php
+++ b/xuanxuan/module/message/ext/config/xuanxuan.php
@@ -1,6 +1,6 @@
 <?php
-$config->message->available['xuanxuan']['story'] = array('opened', 'edited', 'commented', 'frombug', 'changed', 'reviewed', 'closed', 'activated');
-$config->message->available['xuanxuan']['task']  = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'started', 'finished', 'paused', 'canceled', 'restarted', 'closed', 'activated');
-$config->message->available['xuanxuan']['bug']   = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'bugconfirmed', 'resolved', 'closed', 'activated');
-$config->message->available['xuanxuan']['todo']  = array('opened', 'edited');
+$config->message->available['xuanxuan']['story'] = $config->message->objectTypes['story'];
+$config->message->available['xuanxuan']['task']  = $config->message->objectTypes['task'];
+$config->message->available['xuanxuan']['bug']   = $config->message->objectTypes['bug'];
+$config->message->available['xuanxuan']['todo']  = $config->message->objectTypes['todo'];
 $config->message->setting['xuanxuan']['setting'] = $config->message->available['xuanxuan'];

From 096ea509f07ca3d5d23892df27ee681d48833d16 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 20 Dec 2018 11:10:28 +0800
Subject: [PATCH 3/3]  * adjust for entry log page.

---
 module/entry/view/log.html.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/module/entry/view/log.html.php b/module/entry/view/log.html.php
index 13f0446a5c..652a6b6f60 100644
--- a/module/entry/view/log.html.php
+++ b/module/entry/view/log.html.php
@@ -11,21 +11,16 @@
  */
 ?>
 <?php include 'header.html.php';?>
-<div id="mainMenu" class='clearfix'>
-  <div class="btn-toolbar pull-left">
-    <?php common::printLink('entry', 'browse', '', "<span class='text'>{$lang->entry->common}</span>", '', "class='btn btn-link btn-active-text'");?>
-  </div>
-  <div class="btn-toolbar pull-right">
-    <?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'></i> " . $lang->entry->setting, '', "class='btn btn-primary'");?>
-    <?php echo html::backButton('', '' , 'btn');?>
-  </div>
-</div>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <div class='heading'>
       <h2 title='<?php echo $entry->name;?>'>
         <?php echo $entry->name;?>
         <span class='label label-info'><?php echo $lang->entry->log;?></span>
+        <div class="btn-toolbar pull-right">
+          <?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'></i> " . $lang->entry->setting, '', "class='btn btn-primary'");?>
+          <?php echo html::backButton('', '' , 'btn');?>
+        </div>
       </h2>
     </div>
   </div>