gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-31 05:57:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Uwe Steinmann 2017-06-14 16:26:01 +02:00
parent b59b6a0cfb
commit 977f28c30c
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
views/bootstrap/class.AdminTools.php
View File

@ -86,11 +86,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
<?php } ?>
<?php if($accessop->check_view_access('AttributeMgr')) { ?>
<a href="../out/out.AttributeMgr.php" class="span3 btn btn-medium"><i class="icon-tags"></i><br /><?php echo getMLText("global_attributedefinitions")?></a>
<<<<<<< HEAD
<?php } ?>
=======
<?php echo $this->callHook('endOfRow', 3); ?>
>>>>>>> seeddms-5.1.x
</div>
<?php
if($this->params['workflowmode'] == 'advanced') {
@ -104,11 +101,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
<?php } ?>
<?php if($accessop->check_view_access('WorkflowActionsMgr')) { ?>
<a href="../out/out.WorkflowActionsMgr.php" class="span3 btn btn-medium"><i class="icon-bolt"></i><br /><?php echo getMLText("global_workflow_actions"); ?></a>
<<<<<<< HEAD
<?php } ?>
=======
<?php echo $this->callHook('endOfRow', 4); ?>
>>>>>>> seeddms-5.1.x
</div>
<?php
}
@ -123,11 +117,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
<?php } ?>
<?php if($accessop->check_view_access('IndexInfo')) { ?>
<a href="../out/out.IndexInfo.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("fulltext_info")?></a>
<<<<<<< HEAD
<?php } ?>
=======
<?php echo $this->callHook('endOfRow', 5); ?>
>>>>>>> seeddms-5.1.x
</div>
<?php
}
@ -144,11 +135,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
<?php } ?>
<?php if($accessop->check_view_access('Timeline')) { ?>
<a href="../out/out.Timeline.php" class="span3 btn btn-medium"><i class="icon-time"></i><br /><?php echo getMLText("timeline")?></a>
<<<<<<< HEAD
<?php } ?>
=======
<?php echo $this->callHook('endOfRow', 6); ?>
>>>>>>> seeddms-5.1.x
</div>
<div class="row-fluid">
<?php if($accessop->check_view_access('Settings')) { ?>
@ -159,11 +147,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
<?php } ?>
<?php if($accessop->check_view_access('Info')) { ?>
<a href="../out/out.Info.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("version_info")?></a>
<<<<<<< HEAD
<?php } ?>
=======
<?php echo $this->callHook('endOfRow', 7); ?>
>>>>>>> seeddms-5.1.x
</div>
<?php echo $this->callHook('afterRows'); ?>
</div>