Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2016-04-29 14:46:34 +08:00
3 changed files with 15 additions and 15 deletions
+2
View File
@@ -1 +1,3 @@
body.body-modal {padding-bottom: 20px; min-height: 400px}
.list-group-item.active {color: #1A4F85}
+1 -1
View File
@@ -18,7 +18,7 @@ if($contactLists)
else
{
echo '<span class="input-group-btn">';
echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" class="btn"><i class="icon icon-cog"></i></a>';
echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new", '', true) . "\" target='_blank' data-icon='cog' data-title='{$lang->user->contacts->manage}' class='btn iframe'><i class='icon icon-cog'></i></a>";
echo '<a data-toggle="tooltip" title="' . $lang->refresh . '" href="###" class="btn" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></a>';
echo '</span>';
}
+12 -14
View File
@@ -13,22 +13,20 @@
<?php include '../../common/view/header.html.php';?>
<div class='row'>
<?php if($mode == 'edit'):?>
<div class='col-md-3 col-lg-2'>
<div class='panel panel-sm with-list'>
<ul class='list-group'>
<?php
foreach($lists as $id => $listName)
{
$listClass = ($id == $listID) ? 'list-group-item active' : 'list-group-item';
echo html::a(inlink('managecontacts', "listID=$id&mode=edit"), $listName, '', "class='{$listClass}'");
}
echo html::a(inlink('managecontacts', "listID=0&mode=new"), $lang->user->contacts->createList, '', "class='list-group-item'");
?>
</ul>
</div>
<div class='col-sm-3 col-lg-2'>
<ul class='list-group'>
<?php
foreach($lists as $id => $listName)
{
$listClass = ($id == $listID) ? 'list-group-item active' : 'list-group-item';
echo html::a(inlink('managecontacts', "listID=$id&mode=edit"), $listName, '', "class='{$listClass}'");
}
?>
</ul>
<?php echo html::a(inlink('managecontacts', "listID=0&mode=new"), '<i class="icon icon-plus"></i> ' . $lang->user->contacts->createList, '', "class='btn btn-block'"); ?>
</div>
<?php endif;?>
<?php $class = $mode == 'edit' ? 'col-md-9 col-lg-10' : 'col-md-12 col-lg-12';?>
<?php $class = $mode == 'edit' ? 'col-sm-9 col-lg-10' : 'col-sm-12 col-lg-12';?>
<div class='<?php echo $class?>'>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<div class='panel panel-sm'>