Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
<?php
|
||||
$config->message->available['xuanxuan'] = $config->message->objectTypes;
|
||||
$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'];
|
||||
|
||||
Reference in New Issue
Block a user